commit 57a124a3d240d6c6fb50683e3420047e002b84f7
author Dmitry Kalashnik <dkalashnik@mirantis.com> Mon Oct 01 13:23:51 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Oct 01 13:23:51 2018 +0000
tree 64942d92bf0d573c4b390d8d0753db3f8f33225e
parent 707af19587d52bb5372a61234adfe3c08f1dbfee
parent c8d5390cd165a82ce4e9599f167ddfe82701530e

Merge "Enable http_config section for webhook"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index d5424a6..7206d07 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -32,7 +32,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7f907c9..8161fcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,16 @@
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=alertmanager
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-stable SUITE=alertmanager
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-stable SUITE=server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=alertmanager
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-stable SUITE=alertmanager
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-stable SUITE=server
 
 before_script:
   - set -o pipefail

metadata/service/server/container.yml

diff --git a/metadata/service/server/container.yml b/metadata/service/server/container.yml
index 7f170b7..222e703 100644
--- a/metadata/service/server/container.yml
+++ b/metadata/service/server/container.yml
@@ -4,9 +4,11 @@
  - service.prometheus.support
 parameters:
   _param:
+    prometheus_am_queue_capacity: 10000
     prometheus_evaluation_interval: "15s"
     prometheus_region_label: "region1"
     prometheus_scrape_interval: "15s"
+    prometheus_scrape_timeout: "15s"
     prometheus_storage_retention: "360h"
   prometheus:
     server:
@@ -27,11 +29,11 @@
         local:
           retention: ${_param:prometheus_storage_retention}
       alertmanager:
-        notification_queue_capacity: 10000
+        notification_queue_capacity: ${_param:prometheus_am_queue_capacity}
       config:
         global:
           scrape_interval: ${_param:prometheus_scrape_interval}
-          scrape_timeout: "15s"
+          scrape_timeout: ${_param:prometheus_scrape_timeout}
           evaluation_interval: ${_param:prometheus_evaluation_interval}
           external_labels:
             region: ${_param:prometheus_region_label}

prometheus/files/server/prometheus.yml

diff --git a/prometheus/files/server/prometheus.yml b/prometheus/files/server/prometheus.yml
index d7b2fa3..b461629 100644
--- a/prometheus/files/server/prometheus.yml
+++ b/prometheus/files/server/prometheus.yml
@@ -42,6 +42,15 @@
       - names: {{ alertmanager.dns_sd_configs.get('domain', [])|yaml }}
         type: {{ alertmanager.dns_sd_configs.type }}
         port: {{ alertmanager.dns_sd_configs.port }}
+    {%- elif alertmanager.kubernetes_sd_configs is defined %}
+    - kubernetes_sd_configs:
+      - role: {{ alertmanager.kubernetes_sd_configs.role }}
+        namespaces:
+          names: ['{{ alertmanager.kubernetes_sd_configs.namespace }}']
+      relabel_configs:
+      - source_labels: [__meta_kubernetes_pod_name]
+        action: keep
+        regex: {{ alertmanager.kubernetes_sd_configs.pod_name_regex }}
     {%- endif %}
     {%- endif %}
     {%- endfor %}

tests/pillar/server.sls

diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
index 7b65e74..96228d6 100644
--- a/tests/pillar/server.sls
+++ b/tests/pillar/server.sls
@@ -36,12 +36,12 @@
           cert_name: prometheus-server.crt
           key_name: prometheus-server.key
           member:
-            - host: ${_param:cluster_node01_address}
-              port: ${_param:cluster_node01_port}
-            - host: ${_param:cluster_node02_address}
-              port: ${_param:cluster_node02_port}
-            - host: ${_param:cluster_node03_address}
-              port: ${_param:cluster_node03_port}
+            - host: 10.0.175.101
+              port: 4001
+            - host: 10.0.175.102
+              port: 4001
+            - host: 10.0.175.103
+              port: 4001
     recording:
       instance:fd_utilization:
         query: >-
@@ -68,7 +68,7 @@
       remote_write:
         remote_storage_adapter:
           enabled: true
-          url: http://127.0.0.1:9201/write
+          url: "http://127.0.0.1:9201/write"
       alertmanager:
         docker_swarm_alertmanager:
           enabled: true