Commit Graph

29 Commits

Author SHA1 Message Date
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
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
Javier Bértoli
5f3dc6f11a feat(config): allow to manage extra files 2021-05-27 20:42:32 -03:00
lagooj
bfff38b8b7 feat(config): defaults.yaml update archives versions and hashes 2020-11-12 09:53:16 +01:00
noelmcloughlin
9abc98274e chore(windows): tentative windows support 2020-10-19 16:25:52 +01:00
Imran Iqbal
97584e6bc3
Merge pull request #43 from n-rodriguez/fix/debian
Fix node_exporter service not restarted on archive fresh install
2020-08-24 23:21:33 +01:00
Nicolas Rodriguez
b03a1ccf04 fix(pillar): fix service name in archive mode 2020-08-24 23:02:21 +02:00
Javier Bértoli
cdd2e6db52 fix(defaults): set clientlibs defaults to an empty list
BREAKING CHANGE: The golang clientib is not required for
the regular use of this formula but, if you already expected it to be
installed by default, you'll need to update your pillars to do so.
Running this version of the formula over previous ones won't break the
minions, only skip clientlibs.
2020-08-24 10:27:18 -03:00
noelmcloughlin
fe835534e4 chore(firewall): open salt ports 2020-08-17 15:55:39 +01:00
N
ce5b7712c9 refactor(all): align to template-formula; add clientlibs feature
BREAKING CHANGE: The data dictionary is simplified and expanded.
Retest your states and update pillar data accordingly.
For developer convenience, clientlibs states were introduced.
See pillar.example, defaults.yaml, and docs/README.
2020-05-15 11:12:28 +01:00
Mark Gomersbach
b87e8f437c
feat(osfamilymap.yaml): add Gentoo support
Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>
2019-12-22 21:21:38 +01:00
Alexander Weidinger
7b2f5ce0dd feat(textfile_collectors): added smartmon textfile collector 2019-10-17 08:21:16 +02:00
Alexander Weidinger
d73130972a feat(textfile_collectors): added IPMI textfile collector 2019-10-17 08:21:16 +02:00
Alexander Weidinger
930552d7ee feat(textfile_collectors): added support for textfile collectors 2019-10-17 08:21:16 +02:00
Imran Iqbal
07dbfc8d63
feat(yamllint): include for this repo and apply rules throughout
* Semi-automated using `ssf-formula` (v0.5.0)
* Fix errors shown below:

```bash
prometheus-formula$ $(grep "\- yamllint" .travis.yml | sed -e "s:^\s\+-\s\(.*\):\1:")
./prometheus/osfamilymap.yaml
  1:89      error    line too long (116 > 88 characters)  (line-length)
  1:24      error    trailing spaces  (trailing-spaces)
  13:2      error    syntax error: found character '%' that cannot start any token
  24:89     error    line too long (90 > 88 characters)  (line-length)
  25:89     error    line too long (167 > 88 characters)  (line-length)

./prometheus/defaults.yaml
  6:13      error    too many spaces inside braces  (braces)
  6:35      error    too many spaces inside braces  (braces)
  7:11      error    too many spaces inside braces  (braces)
  7:25      error    too many spaces inside braces  (braces)
  8:22      warning  truthy value should be one of [false, true]  (truthy)
  9:25      warning  truthy value should be one of [false, true]  (truthy)
  49:85     error    trailing spaces  (trailing-spaces)
  103:20    warning  truthy value should be one of [false, true]  (truthy)
  104:25    warning  truthy value should be one of [false, true]  (truthy)
  108:16    warning  truthy value should be one of [false, true]  (truthy)
  113:24    warning  missing starting space in comment  (comments)

pillar.example
  31:6      warning  missing starting space in comment  (comments)
  32:8      warning  missing starting space in comment  (comments)
  32:7      warning  comment not indented like content  (comments-indentation)
  51:5      warning  comment not indented like content  (comments-indentation)
  65:89     error    line too long (110 > 88 characters)  (line-length)
  68:29     error    too many spaces after colon  (colons)
  68:34     warning  too few spaces before comment  (comments)
  68:89     error    line too long (106 > 88 characters)  (line-length)
  69:34     warning  too few spaces before comment  (comments)
  69:89     error    line too long (98 > 88 characters)  (line-length)
  75:9      error    wrong indentation: expected 10 but found 8  (indentation)
  76:11     error    wrong indentation: expected 12 but found 10  (indentation)
  77:13     warning  comment not indented like content  (comments-indentation)
  79:89     error    line too long (101 > 88 characters)  (line-length)
  81:9      warning  comment not indented like content  (comments-indentation)
  86:89     error    line too long (103 > 88 characters)  (line-length)
  91:11     error    wrong indentation: expected 12 but found 10  (indentation)
  106:15    error    wrong indentation: expected 16 but found 14  (indentation)
  108:41    warning  too few spaces before comment  (comments)
  118:89    error    line too long (96 > 88 characters)  (line-length)
  139:13    error    wrong indentation: expected 14 but found 12  (indentation)
  143:7     error    wrong indentation: expected 8 but found 6  (indentation)
  145:9     error    wrong indentation: expected 10 but found 8  (indentation)
  157:6     warning  missing starting space in comment  (comments)
  158:20    error    too many spaces inside braces  (braces)
  158:47    error    too many spaces inside braces  (braces)
```
2019-08-16 17:42:04 +01:00
N
a13dd03af1
fix(example): fix pillar.example formatting 2019-06-23 13:28:58 +01:00
N
665e116cee
Merge branch 'master' of https://github.com/saltstack-formulas/prometheus-formula into archives 2019-06-22 18:19:41 +01:00
N
731198dd4d
test(centos): verified on CentosOS 2019-06-22 17:48:28 +01:00
N
d43033a0fd
feat(archives): user managementX 2019-06-19 02:05:30 +01:00
N
3ec910e7f7
feat(archives): support for various prometheus archives 2019-06-18 10:49:49 +01:00
N
36b3e62678
feat(linux): alternatives support & updated unit tests 2019-06-17 19:36:07 +01:00
N
b074bd3dee
test(inspec): expand unittests for archive format 2019-06-16 01:23:52 +01:00
N
1f86f4a27c
feat(archives): support for archives file format
BREAKING CHANGE: the parameter `pkg` is now a dictionary. References
 to `prometheus.pkg` should be changed to `prometheus.pkg.name`.
2019-06-15 01:52:59 +01:00
N
907f9a6276
feat(repository): add support for pkgrepo.managed
BREAKING CHANGE: the variable 'pkg' was renamed 'pkg.name',
  update your pillars
2019-06-12 11:03:28 +01:00
Alexander Weidinger
94078fed74 feat(args): handle service arguments the same way 2019-04-30 21:59:28 +02:00
Alexander Weidinger
34ada49bf7 feat(exporters): added node_exporter 2019-04-29 13:54:40 +02:00
Alexander Weidinger
b9b7cc0841 feat(prometheus): basic setup based on template-formula 2019-04-25 22:14:39 +02:00