Linux-Help/formula-prometheus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add Salt 2018.3 tests

Browse source 
Change-Id: Id7b6aa73d0131aca22283b2815abb18a360bf223
This commit is contained in:
Martin Polreich 2018-04-25 15:03:05 +02:00
parent ddc9a92a86
commit c9dadf7931
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.kitchen.yml
View file

@ -32,7 +32,7 @@ verifier:
platforms: platforms:
- name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %> - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config: 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 platform: ubuntu
suites: suites:

16
.travis.yml
View file

@ -20,12 +20,16 @@ install:
- bundle install - bundle install
env: env:
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=alertmanager - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-stable SUITE=alertmanager
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server - 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: before_script:
- set -o pipefail - set -o pipefail

14
tests/pillar/server.sls
View file

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