Commit Graph

20 Commits

Author SHA1 Message Date
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
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
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
83efb0b434
test(pillar/repo): avoid alertmanager config where newer than package
* `smtp_hello` (v0.8.0):
  - a566036015
* `http_config` (v0.15.0-rc.0):
  - d678022fea
2021-02-27 22:03:07 +00:00
lagooj
018e759183 test(archive): add env vars tests 2021-01-06 22:40:14 +01:00
lagooj
43053a6e59 test(archive): add unofficial exporter test 2020-11-17 15:47:00 +01:00
lagooj
34a9805886 test(archive): update test according to defaults.yaml changes 2020-11-12 09:53:16 +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
7c1cdb8fdf test(services): fix path for debian family 2020-08-24 19:55:09 -03:00
Nicolas Rodriguez
49e6fa5671 fix(test): fix tests for RedHat OSes in repo mode 2020-08-25 00:03:10 +02:00
Nicolas Rodriguez
910a06df5f fix(test): fix test pillars 2020-08-24 22:48:53 +02:00
Nicolas Rodriguez
41da7cc697 fix(test): fix alertmanager service name in repo mode test 2020-08-24 18:07:51 +02:00
Javier Bértoli
c5ad857590 test(packages): check when using repo or archives 2020-08-21 10:34:29 -03: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