Commit Graph

82 Commits

Author SHA1 Message Date
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
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
N
d304acef89
Merge pull request #56 from netmanagers/master
feat(config): allow to manage extra files
2021-05-28 14:48:52 +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
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
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
d30b42ced0
fix(clientlibs/install): ensure tar is available for Oracle Linux 8 2021-02-27 22:03:10 +00: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
noelmcloughlin
782dd45452 fix(clean): include repo clean too 2020-11-28 20:25:01 +00: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
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
N
61b1a43e40
Merge pull request #48 from noelmcloughlin/win2
fix(windows): windows has no osarch grain
2020-11-12 09:38:25 +00:00
lagooj
bfff38b8b7 feat(config): defaults.yaml update archives versions and hashes 2020-11-12 09:53:16 +01:00
lagooj
7a08e8db54 feat(archive): use args pillar when using upstream from repo / archive 2020-11-11 14:11:15 +01:00
noelmcloughlin
5457a9f2f2 fix(state): dangling servicename 2020-11-07 19:18:55 +00:00
noelmcloughlin
468e420b34 fix(windows): windows has no osarch grain 2020-11-03 10:18:43 +00:00
noelmcloughlin
9abc98274e chore(windows): tentative windows support 2020-10-19 16:25:52 +01:00
Imran Iqbal
f6eb546174
chore: standardise structure [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/261
2020-10-02 23:02:49 +01:00
Javier Bértoli
a5b44c812b fix(archive): add config file to service only if defined 2020-08-29 18:26:02 -03:00
Javier Bértoli
a5d4d03f8d test(archive): add tests to check service names
this commit makes `service name` to consider pillar provided values,
fallback to a consistent `service name` when {archive|package} is available
for the component, or to `service name == name` when no other value
is provided
2020-08-25 14:10:02 -03:00
Javier Bértoli
219250a215 fix(archive): service name needs to use pillar values
in archive mode, the service file name was ignoring the value set in
pillar (`pgk:component:service:name`).
2020-08-25 11:28:28 -03:00
Javier Bértoli
844a77f16a fix(debian): add some valid defaults 2020-08-24 19:25:19 -03: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
Nicolas Rodriguez
0169c89ca4 fix(service): pick up the right service name in pillars 2020-08-24 22:47:14 +02:00
Nicolas Rodriguez
deb9cd28a8 fix(service): service is not reloaded because of failing if 2020-08-24 17:52:22 +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
Mark Gomersbach
e0aecdbbbc
fix(osfamilymap.yaml): add gentoo exporters and remove loose go install
Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>
2020-08-24 13:56:07 +02:00
Javier Bértoli
3014494740 feat(debian): allow to install using OS packages 2020-08-21 10:33:20 -03:00
N
a0cec39d35
Merge pull request #38 from noelmcloughlin/i16
fix(linux): service.args is freebsd
2020-08-19 01:28:28 +02:00
noelmcloughlin
d65858a154 fix(permissions): correct basedir user/group 2020-08-18 21:50:52 +01:00
noelmcloughlin
ceb9863749 fix(linux): service.args is freebsd 2020-08-18 21:18:52 +01:00
noelmcloughlin
fe835534e4 chore(firewall): open salt ports 2020-08-17 15:55:39 +01:00
noelmcloughlin
fd2ff5fade fix(ubuntu): pkgrepo cannot be used 2020-08-09 23:21:14 +01:00
N
9f63dab5b7
Merge branch 'master' into refactor2 2020-08-09 23:01:28 +02:00
Imran Iqbal
2660b19e7f style(libtofs.jinja): use Black-inspired Jinja formatting [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/237
2020-07-19 23:28:19 +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
Imran Iqbal
5403088d09 fix(libtofs): “files_switch” mess up the variable exported by “map.jinja” [skip ci]
* Checked using https://github.com/myii/ssf-formula/pull/131
2020-02-14 19:10:52 +00: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
Imran Iqbal
341fff36ea
fix: test fix for bug 24 2019-12-12 05:58:56 +00:00
Alexander Weidinger
39dacf09a0 fix(args): allow boolean arguments 2019-10-17 08:21:16 +02:00
Alexander Weidinger
a4fd589592 fix(package): use correct node exporter package name in Debian 2019-10-17 08:21:16 +02: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