BlueWolf
ef8a3a9ad7
fix: removed erroneus dash (-)
...
Dash was incorrectly left alongside squid_exporter entry in
osfamilymap.
Resolves : #59
2021-06-30 05:19:08 +01:00
BlueWolf
076869a8cd
fix: added handle for alternative argument opts header
...
Centos and oraclelinux repositories for prometheus include bespoke headers
in the environment files (e.g. Debian: ARGS=, Centos: PROMETHEUS_OPTS=
ALERTMANAGER_OPTS=). This has been added as a default pillar with osmap
variances.
Additionally archlinux repo install was failing so added basic support -
an issue still remains for the prometheus app itself due to the service
file included in the arch repo hardcoding some config options - resulting
in the possibility to duplicate arguments resulting in a service error.
The prometheus service currently does not start due to permissions not being
applied to a data folder. The added config.storage begins to solve this and
ensures alignment on all platforms but would result in a duplicate config
entry as above. Prometheus on arch therefore needs more work but the exporter
installs now work.
Resolves : #59
2021-06-30 05:16:56 +01:00
BlueWolf
5c1d8b6870
fix: switched test config entry that wasnt available for deb9
...
The --collector.systemd config argument is unavailable in the
older packages.
The formula handles either scenario so switching the check out from the
test pillar for --log.level=debug instead
Resolved issue identified in pull request check for debian
2021-06-30 05:16:56 +01:00
BlueWolf
0ca247a37e
fix: added guidance and reverted incorrected changes from prior commits
...
Added inspec checks for environment files and specifically prometheus
and node_exporter args. Provided comments throughout the key reference
points for users to signpost the differing approaches to args used along
with more clearly identifying the difference between archive and repo
approach. Tests appear to be working on both approaches though updates
have been focused at repo install method.
Fixes : #59
2021-06-30 05:16:56 +01:00
BlueWolf
f2261f9dc9
fix: revert to use of macro.jinja for arg handling
...
The previous additions to environ.sh.jinja were fixing something that wasnt broken.
2021-06-30 05:16:56 +01:00
BlueWolf
e52f804bf4
fix: rework to implement environment variables handling
...
Developed environ.sh.jinja and added test pillar data to default
Corrected prometheus.config.environ
Switched default test pillar to use none archive - due to deployment of custom service
Disabled a number of exporters following switch from archive due to failing - to be reviewed
Corrected prometheus environ_file location
Resolves : #59
2021-06-30 05:15:38 +01:00
Imran Iqbal
fa96aabba7
ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/331
2021-06-21 20:47:50 +01:00
semantic-release-bot
ee1e08bb2c
chore(release): 5.5.0 [skip ci]
...
# [5.5.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.4.0...v5.5.0 ) (2021-05-28)
### Bug Fixes
* **clientlibs/install:** ensure `tar` is available for Oracle Linux 8 ([d30b42cd30b42ced0cc112e7cc112e71b9#57 ](https://github.com/saltstack-formulas/prometheus-formula/issues/57 )
* **pillar:** fix `OverflowError: Range too big` -- `MAX_RANGE (100000)` ([c9cfdfdc9cfdfd9e1https://github.com//gitlab.com/myii/prometheus-formula/-/jobs/1077740890/issues/L779 )
### Continuous Integration
* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([046b0ee046b0ee23905f66ac05f66ac9bcdf0ec43df0ec43f52a9e26a7a9e26a795de283bfbe283bfb1881b2c50a1b2c50ae37bb7b816bb7b816aac08ad2ca08ad2caf4c5f3dc6f5f3dc6f11a2b38c9e2b38c9e40283efb0b83efb0b434
2021-05-28 13:59:46 +00:00
N
d304acef89
Merge pull request #56 from netmanagers/master
...
feat(config): allow to manage extra files
2021-05-28 14:48:52 +01:00
N
6ff86756ab
Merge pull request #58 from netmanagers/fix-typo
...
fix(node_exporter): typo
2021-05-28 14:46:46 +01:00
Javier Bértoli
cc112e71b9
fix(node_exporter): typo
...
closes #57
2021-05-28 09:43:49 -03:00
Javier Bértoli
5f3dc6f11a
feat(config): allow to manage extra files
2021-05-27 20:42:32 -03:00
Imran Iqbal
babe311306
chore(pre-commit): use info report level for rstcheck [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/325
2021-05-20 14:10:06 +01:00
Imran Iqbal
1b2c50ae37
docs: remove files which aren't formula-specific [skip ci]
...
Further reason is to avoid issues with `rst-lint`:
```
ERROR docs/index.rst:10 Unknown directive type "toctree".
```
2021-05-17 18:59:42 +01:00
N
7c69be2077
Merge pull request #55 from corey-hammerton/systemd-params-null
...
feat(archive): allow command line arguments without values in archive.install
2021-05-15 12:55:52 +01:00
Imran Iqbal
046b0ee239
ci: add arch-master to matrix and update .travis.yml [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/323
2021-05-09 22:33:17 +01:00
Imran Iqbal
bb7b816aac
docs(readme): fix headings and contributing link [skip ci]
2021-05-05 15:21:42 +01:00
chammerton
08ad2caf4c
feat(archive): allow command line arguments without values
...
* If a service.args value is define as null, only render the param (key) in the systemd unit file
2021-05-03 11:17:32 -04:00
Imran Iqbal
a9e26a795d
ci(kitchen+gitlab): adjust matrix to add 3003 [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/318
2021-04-23 08:49:01 +01:00
Imran Iqbal
ed1ee70605
chore: update CODEOWNERS & .yamllint re: kitchen-vagrant [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/310
2021-04-05 18:21:18 +01:00
Imran Iqbal
2b38c9e402
test: standardise use of share suite & _mapdata state [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/302
2021-03-23 21:32:19 +00:00
Imran Iqbal
df0ec43f52
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/299
2021-03-07 22:04:44 +00:00
Imran Iqbal
c9cfdfd9e1
fix(pillar): fix OverflowError: Range too big -- MAX_RANGE (100000)
...
https://gitlab.com/myii/prometheus-formula/-/jobs/1077740890#L779
```
Traceback (most recent call last):
File "/usr/local/lib/python3.8/dist-packages/salt/utils/templates.py", line 501, in render_jinja_tmpl
output = template.render(**decoded_context)
File "/usr/local/lib/python3.8/dist-packages/jinja2/environment.py", line 1090, in render
self.environment.handle_exception()
File "/usr/local/lib/python3.8/dist-packages/jinja2/environment.py", line 832, in handle_exception
reraise(*rewrite_traceback_stack(source=source))
File "/usr/local/lib/python3.8/dist-packages/jinja2/_compat.py", line 28, in reraise
raise value.with_traceback(tb)
File "<template>", line 212, in top-level template code
File "/usr/local/lib/python3.8/dist-packages/jinja2/sandbox.py", line 462, in call
return __context.call(__obj, *args, **kwargs)
File "/usr/local/lib/python3.8/dist-packages/jinja2/sandbox.py", line 173, in safe_range
raise OverflowError(
OverflowError: Range too big. The sandbox blocks ranges larger than MAX_RANGE (100000).
; line 212
---
[...]
skip_verify: true
linux:
# 'Alternatives system' priority: zero disables (default)
# yamllint disable-line rule:braces
altpriority: {{ range(1, 9100000) | random }} <======================
```
2021-03-07 22:04:39 +00:00
Imran Iqbal
a7875aea8a
chore(yamllint): add .git/ to ignores [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/297
2021-03-05 18:34:45 +00:00
Imran Iqbal
e283bfb188
ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/293
2021-02-27 22:23:38 +00:00
Imran Iqbal
d30b42ced0
fix(clientlibs/install): ensure tar is available for Oracle Linux 8
2021-02-27 22:03:10 +00:00
Imran Iqbal
83efb0b434
test(pillar/repo): avoid alertmanager config where newer than package
...
* `smtp_hello` (v0.8.0):
- a566036015d678022fea
2021-02-27 22:03:07 +00:00
Daniel Dehennin
35fad9bca6
chore(rubocop): allow use of YAML.load for _mapdata.rb [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/296
2021-02-23 21:50:50 +00:00
Dafydd Jones
fae14f2563
chore(shellcheck): switch hook for shellcheck [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/295
2021-02-21 08:33:16 +00:00
Imran Iqbal
05f66ac9bc
ci(gemfile+lock): use ssf customised kitchen-docker repo [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/294
2021-02-17 13:52:57 +00:00
Imran Iqbal
3e043294cc
chore: standardise structure (.gitignore & _mapdata.rb) [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/292
2021-02-11 11:52:54 +00:00
semantic-release-bot
286eaafc93
chore(release): 5.4.0 [skip ci]
...
# [5.4.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.3.0...v5.4.0 ) (2021-02-10)
### Bug Fixes
* **clean:** include repo clean too ([782dd45782dd45452e0f6a8be0f6a8baeb7d80e4a7d80e4afc14f290c24f290c2dde60ec8e560ec8e514d16311371631137b1b4e60b174e60b17741018e759018e759183
2021-02-10 18:34:14 +00:00
Daniel
f51bee4da0
Merge pull request #54 from lagooj/feat/manage_env_vars_systemd
...
Manage env vars
2021-02-10 18:25:23 +00:00
Imran Iqbal
60ec8e514d
ci(pre-commit): update hook for rubocop [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/290
2021-02-02 00:22:23 +00:00
lagooj
018e759183
test(archive): add env vars tests
2021-01-06 22:40:14 +01:00
lagooj
1631137b1b
docs(archive): update pillar.example with env var for mysqld_exporter
2021-01-06 22:40:14 +01:00
lagooj
4e60b17741
feat(archive): managing env vars in systemd unit
...
* add env pillar under component:name:service
* update systemd template
2021-01-06 22:40:14 +01:00
Imran Iqbal
e0f6a8baeb
ci(commitlint): ensure upstream/master uses main repo URL [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/278
2020-12-20 18:49:06 +00:00
Imran Iqbal
7d80e4afc1
ci(gitlab-ci): add rubocop linter (with allow_failure) [skip ci]
...
* Automated using https://github.com/myii/ssf-formula/pull/277
2020-12-19 14:34:43 +00:00
Imran Iqbal
4f290c2dde
ci(gitlab-ci): use GitLab CI as Travis CI replacement
...
* Automated using https://github.com/myii/ssf-formula/pull/275
2020-12-16 06:39:08 +00:00
N
ba6fde24c0
Merge pull request #53 from noelmcloughlin/repo
...
fix(clean): include repo clean too
2020-12-15 10:04:57 +00:00
noelmcloughlin
782dd45452
fix(clean): include repo clean too
2020-11-28 20:25:01 +00:00
semantic-release-bot
156d09e32d
chore(release): 5.3.0 [skip ci]
...
# [5.3.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.2.0...v5.3.0 ) (2020-11-17)
### Documentation
* **archive:** update pillar.example with unofficial exporter ([10c0b4a10c0b4a0302ff6b902ff6b90cd843053a643053a6e59
2020-11-17 23:30:21 +00:00
N
6ab735e16c
Merge pull request #52 from lagooj/feat/unofficial_exporters
...
Manage unofficial exporters
2020-11-17 23:17:31 +00:00
lagooj
43053a6e59
test(archive): add unofficial exporter test
2020-11-17 15:47:00 +01:00
lagooj
10c0b4a030
docs(archive): update pillar.example with unofficial exporter
2020-11-17 15:46:52 +01:00
lagooj
2ff6b90cd8
feat(archive): add support for non official exporters
...
* add offical pillar true(default) / false
to use raw source url in component:name:archive:source
* add tar pillar true(default) / false
to use file instead of tar, some repo provide only the binary
* update archive/install.sls and map.jinja
2020-11-17 12:50:36 +01:00
semantic-release-bot
aad810fa6a
chore(release): 5.2.0 [skip ci]
...
# [5.2.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.1.0...v5.2.0 ) (2020-11-12)
### Bug Fixes
* **state:** dangling servicename ([5457a9f5457a9f2f2468e420468e420b347a08e8d7a08e8db54
2020-11-12 09:49:46 +00:00
N
815f4757a9
Merge pull request #50 from lagooj/feat/manage_args
...
Managed args for archive as upstream
2020-11-12 09:38:58 +00:00
N
cb2a565d98
Merge pull request #49 from noelmcloughlin/service
...
fix(state): dangling servicename
2020-11-12 09:38:44 +00:00
