Commit Graph

73 Commits

Author SHA1 Message Date
Alexander Weidinger
464a186d78 fix(examples): fixed pillar.example 2019-10-17 08:21:16 +02:00
Alexander Weidinger
871da358a6 feat(freebsd): support for FreeBSD 2019-10-17 08:21:16 +02:00
Imran Iqbal
fabcc4ad77 docs(contributing): remove to use org-level file instead [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/70
2019-10-14 12:31:04 +01:00
Imran Iqbal
da2a5aa017
docs(readme): update link to CONTRIBUTING [skip ci] 2019-10-14 11:48:39 +01:00
Imran Iqbal
53e330e35b chore(issues): remove issues templates to use org-level templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/61
2019-10-10 15:28:53 +01:00
semantic-release-bot
58f73992fc chore(release): 3.1.2 [skip ci]
## [3.1.2](https://github.com/saltstack-formulas/prometheus-formula/compare/v3.1.1...v3.1.2) (2019-10-10)

### Bug Fixes

* **clean.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/prometheus-formula/commit/8056339))
* **install.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/prometheus-formula/commit/51f5485))
* **install.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/prometheus-formula/commit/173bc4f))
* **install.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/prometheus-formula/commit/85c7fce))

### Continuous Integration

* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/prometheus-formula/commit/569328b))
2019-10-10 03:47:40 +00:00
Imran Iqbal
bb94cbc606
Merge pull request #22 from myii/ci/merge-matrix-and-add-salt-lint-and-rubocop
ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job
2019-10-09 23:51:38 +01:00
Imran Iqbal
569328b65d ci: merge travis matrix, add salt-lint & rubocop to lint job
* Semi-automated using https://github.com/myii/ssf-formula/pull/60
2019-10-09 18:22:09 +01:00
Imran Iqbal
51f5485615
fix(install.sls): fix salt-lint errors
```bash
Examining prometheus/package/install.sls of type state
[201] Trailing whitespace
prometheus/package/install.sls:7
```
2019-10-09 18:21:02 +01:00
Imran Iqbal
805633972b
fix(clean.sls): fix salt-lint errors
```bash
Examining prometheus/archive/install.sls of type state
[201] Trailing whitespace
prometheus/archive/install.sls:33
    - source_hash: {{ p.pkg[name]['archive_hash'] }}

[201] Trailing whitespace
prometheus/archive/install.sls:44
```
2019-10-09 18:21:02 +01:00
Imran Iqbal
173bc4f348
fix(install.sls): fix salt-lint errors
```bash
Examining prometheus/archive/install.sls of type state
[201] Trailing whitespace
prometheus/archive/install.sls:33
    - source_hash: {{ p.pkg[name]['archive_hash'] }}

[201] Trailing whitespace
prometheus/archive/install.sls:44
```
2019-10-09 18:21:02 +01:00
Imran Iqbal
85c7fceb0d
fix(install.sls): fix salt-lint errors
```bash
Examining prometheus/archive/alternatives/install.sls of type state
[206] Jinja variables should have spaces before and after: {{ var_name }}
prometheus/archive/alternatives/install.sls:21
    - name: update-alternatives --install {{ p.dir.basedir }}/{{ name }} prometheus-{{ name }}-home {{ p.dir.basedir }}/{{ bundle }} {{p.linux.altpriority}}

[204] Lines should be no longer that 160 chars
prometheus/archive/alternatives/install.sls:50
    - name: update-alternatives --install /usr/local/bin/{{ b }} prometheus-{{ name }}-{{ b }} {{ p.dir.basedir }}/{{ bundle }}/{{ b }} {{ p.linux.altpriority }}
```
2019-10-09 18:21:02 +01:00
Imran Iqbal
9def915a11 ci: merge travis matrix, add salt-lint & rubocop to lint job
* Automated using https://github.com/myii/ssf-formula/pull/60
2019-10-08 16:38:51 +01:00
semantic-release-bot
ff96b7dba2 chore(release): 3.1.1 [skip ci]
## [3.1.1](https://github.com/saltstack-formulas/prometheus-formula/compare/v3.1.0...v3.1.1) (2019-10-07)

### Bug Fixes

* **config:** cope with aberrant service names ([0a33842](https://github.com/saltstack-formulas/prometheus-formula/commit/0a33842))

### Continuous Integration

* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([3dc6e12](https://github.com/saltstack-formulas/prometheus-formula/commit/3dc6e12))
* **kitchen:** change `log_level` to `debug` instead of `info` ([af666db](https://github.com/saltstack-formulas/prometheus-formula/commit/af666db))
* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([3332493](https://github.com/saltstack-formulas/prometheus-formula/commit/3332493))
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([a624dd8](https://github.com/saltstack-formulas/prometheus-formula/commit/a624dd8))
* **kitchen+travis:** replace EOL pre-salted images ([0895d81](https://github.com/saltstack-formulas/prometheus-formula/commit/0895d81))
* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([6221888](https://github.com/saltstack-formulas/prometheus-formula/commit/6221888))
* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([1784b34](https://github.com/saltstack-formulas/prometheus-formula/commit/1784b34))
2019-10-07 20:34:21 +00:00
Niels Abspoel
43888ec950
Merge pull request #21 from alxwr/fix-aberrant-service-names
fix(config): cope with aberrant service names
2019-10-07 22:04:33 +02:00
Imran Iqbal
d28c58ce85 chore(yamllint): update ignored paths and add octal-values [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/59
2019-10-07 19:35:02 +01:00
Imran Iqbal
dcbf2911b7 chore(issues): update Bug report & Feature request templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/58
2019-10-07 15:29:21 +01:00
Alexander Weidinger
0a3384222c fix(config): cope with aberrant service names 2019-10-04 22:56:17 +02:00
Imran Iqbal
333249374e ci(kitchen): install required packages to bootstrapped opensuse [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/53
2019-10-02 00:10:04 +01:00
Imran Iqbal
a624dd8c82 ci(kitchen): use bootstrapped opensuse images until 2019.2.2 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/52
2019-10-01 21:36:57 +01:00
Imran Iqbal
62218882a0 ci(platform): add arch-base-latest (commented out for now) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/50
2019-10-01 16:23:07 +01:00
Imran Iqbal
b64644fb97 chore(issues): provide Bug report & Feature request templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/48
2019-09-30 16:02:19 +01:00
Imran Iqbal
af666dbc34 ci(kitchen): change log_level to debug instead of info
* Automated using https://github.com/myii/ssf-formula/pull/41
2019-09-23 17:02:53 +01:00
Niels Abspoel
f13ab6fffd
Merge pull request #18 from myii/chore/standardise-structure
ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
2019-09-12 18:26:20 +02:00
Imran Iqbal
1784b34b4c
ci(yamllint): add rule empty-values & use new yaml-files setting
* Semi-automated using https://github.com/myii/ssf-formula/pull/27
* Fix errors shown below:

```bash
prometheus-formula$ yamllint -s .
./pillar.example
  78:25     error    empty value in block mapping  (empty-values)
```
2019-09-10 22:33:05 +01:00
Niels Abspoel
e7e06ffe30
Merge pull request #17 from myii/chore/standardise-structure
ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
2019-09-08 21:43:00 +02:00
Imran Iqbal
3dc6e129ae ci: use dist: bionic & apply opensuse-leap-15 SCP error workaround
* Automated using https://github.com/myii/ssf-formula/pull/22
2019-09-07 03:41:28 +01:00
Niels Abspoel
7669d2cc3e
Merge pull request #16 from myii/chore/standardise-structure
ci(kitchen+travis): replace EOL pre-salted images
2019-09-01 11:42:53 +02:00
Imran Iqbal
0895d81e99 ci(kitchen+travis): replace EOL pre-salted images
* Automated using https://github.com/myii/ssf-formula/pull/16
2019-08-28 07:42:35 +01:00
Imran Iqbal
4a5c1bfc67
Merge pull request #15 from myii/chore/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-08-17 16:56:25 +01:00
Imran Iqbal
0d0d9deaee chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.6.0)
2019-08-17 16:06:58 +01:00
semantic-release-bot
6167414968 chore(release): 3.1.0 [skip ci]
# [3.1.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v3.0.1...v3.1.0) (2019-08-17)

### Continuous Integration

* **kitchen+travis:** modify matrix to include `develop` platform ([fc0f5b6](https://github.com/saltstack-formulas/prometheus-formula/commit/fc0f5b6))

### Features

* **yamllint:** include for this repo and apply rules throughout ([07dbfc8](https://github.com/saltstack-formulas/prometheus-formula/commit/07dbfc8))
2019-08-17 09:24:47 +00:00
Niels Abspoel
a94cd58a0e
Merge pull request #14 from myii/chore/standardise-structure
feat(yamllint): include for this repo and apply rules throughout
2019-08-17 09:51:23 +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
Niels Abspoel
41a287398f
Merge pull request #13 from myii/ci/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-07-25 21:27:37 +02:00
Imran Iqbal
319086893a chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.1.0-rc.2)
2019-07-25 09:44:14 +01:00
Imran Iqbal
7ffdf5ae98
Merge pull request #12 from myii/ci/use-develop-image-in-matrix
ci(kitchen+travis): modify matrix to include `develop` platform
2019-07-22 04:18:35 +01:00
Imran Iqbal
090e77bafb chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.1.0-rc.1)
2019-07-19 12:34:16 +01:00
semantic-release-bot
117708bee7 chore(release): 3.0.1 [skip ci]
## [3.0.1](https://github.com/saltstack-formulas/prometheus-formula/compare/v3.0.0...v3.0.1) (2019-06-28)

### Bug Fixes

* **alternatives:** fix requisite ([8c410d7](https://github.com/saltstack-formulas/prometheus-formula/commit/8c410d7))
2019-06-28 10:08:08 +00:00
N
5045a76f82
Merge pull request #11 from noelmcloughlin/archives
fix(alternatives): fix requisite
2019-06-28 10:57:23 +01:00
Imran Iqbal
fc0f5b6187
ci(kitchen+travis): modify matrix to include develop platform
* Use balanced matrix based on `template-formula` guidelines
* Initial ref: https://github.com/saltstack-formulas/template-formula/issues/118
2019-06-28 07:50:48 +01:00
N
8c410d73f8
fix(alternatives): fix requisite 2019-06-26 00:00:40 +01:00
N
58ed85a1f9
chore(alternatives): enable alternatives in pillar.example 2019-06-25 23:50:23 +01:00
semantic-release-bot
7ee67adf71 chore(release): 3.0.0 [skip ci]
# [3.0.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v2.0.0...v3.0.0) (2019-06-23)

### Bug Fixes

* **example:** fix pillar.example formatting ([a13dd03](https://github.com/saltstack-formulas/prometheus-formula/commit/a13dd03))
* **repo:** use_upstream_repo corrections; separate users state ([eda47f7](https://github.com/saltstack-formulas/prometheus-formula/commit/eda47f7))
* **service:** ensure service file is removed on clean ([c735a6d](https://github.com/saltstack-formulas/prometheus-formula/commit/c735a6d))
* **suse:** bypass salt alternatives.install errors ([1a890e5](https://github.com/saltstack-formulas/prometheus-formula/commit/1a890e5))
* **systemd:** ensure systemd detects new service ([149dd81](https://github.com/saltstack-formulas/prometheus-formula/commit/149dd81))

### Features

* **archives:** support for archives file format ([1f86f4a](https://github.com/saltstack-formulas/prometheus-formula/commit/1f86f4a))
* **archives:** support for various prometheus archives ([3ec910e](https://github.com/saltstack-formulas/prometheus-formula/commit/3ec910e))
* **archives:** user managementX ([d43033a](https://github.com/saltstack-formulas/prometheus-formula/commit/d43033a))
* **linux:** alternatives support & updated unit tests ([36b3e62](https://github.com/saltstack-formulas/prometheus-formula/commit/36b3e62))

### Tests

* **centos:** verified on CentosOS ([731198d](https://github.com/saltstack-formulas/prometheus-formula/commit/731198d))
* **inspec:** expand unittests for archive format ([b074bd3](https://github.com/saltstack-formulas/prometheus-formula/commit/b074bd3))
* **inspec:** fix tests ([4092fb4](https://github.com/saltstack-formulas/prometheus-formula/commit/4092fb4))

### BREAKING CHANGES

* **repo:** The formula has been refactored to accomodate multiple packages,
archives, users, and repos. Update your pillars and top states
* **archives:** the parameter `pkg` is now a dictionary. References
 to `prometheus.pkg` should be changed to `prometheus.pkg.name`.
2019-06-23 16:56:10 +00:00
N
d6907786eb
Merge pull request #5 from noelmcloughlin/archives
feat(archives): tarball archives & linux alternatives
2019-06-23 17:45:43 +01:00
N
4092fb4192
test(inspec): fix tests 2019-06-23 17:33:48 +01:00
N
1a890e5564
fix(suse): bypass salt alternatives.install errors 2019-06-23 17:01:52 +01:00
N
c735a6deea
fix(service): ensure service file is removed on clean 2019-06-23 15:18:40 +01:00
N
149dd817f2
fix(systemd): ensure systemd detects new service 2019-06-23 13:55:08 +01:00
N
a13dd03af1
fix(example): fix pillar.example formatting 2019-06-23 13:28:58 +01:00