Merge pull request #67 from mdschmitt/master

Check for Amazon in osfamilymap to create pkg repo

.gitlab-ci.yml

@@ -167,9 +167,9 @@ default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # repo-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # repo-amazonlinux-2-master-py3: {extends: '.test_instance'}
-# amazonlinux-2-master-py3: {extends: '.test_instance'}
+amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 # repo-oraclelinux-8-master-py3: {extends: '.test_instance'}
 oraclelinux-8-master-py3: {extends: '.test_instance'}

prometheus/clientlibs/install.sls

@@ -28,7 +28,7 @@ prometheus-clientlibs-install-{{ name }}:
         - group
         - mode
         {%- endif %}
-        {%- if grains.get('osfinger', '') in ['Oracle Linux Server-8'] %}
+        {%- if grains.get('osfinger', '') in ['Oracle Linux Server-8', 'Amazon Linux-2'] %}
   pkg.installed:
     - name: tar
     - require_in:

prometheus/osfamilymap.yaml

@@ -206,9 +206,14 @@ RedHat:
           args:
             config.file: /etc/prometheus/blackbox.yml
     repo:
+        {%- if grains.os == 'Amazon' %}
+          {%- set releasever = salt['cmd.run']("rpm -E '%{rhel}'") %}
+        {% else %}
+          {%- set releasever = "$releasever" %}
+        {%- endif %}
       # https://akai-tsuki.hatenablog.com/entry/2017/12/03/000000
       # yamllint disable rule:line-length
-      baseurl: 'https://packagecloud.io/prometheus-rpm/release/el/$releasever/$basearch'
+      baseurl: "https://packagecloud.io/prometheus-rpm/release/el/{{ releasever }}/$basearch"
       gpgkey: 'https://packagecloud.io/prometheus-rpm/release/gpgkey gpgkey2=https://raw.githubusercontent.com/lest/prometheus-rpm/master/RPM-GPG-KEY-prometheus-rpm'
       # yamllint enable rule:line-length
       sslverify: 1