Added Kitchen tests and Travis

Change-Id: Ie5620ef3c416df76287d7864dbc46e0b9c66ab79
diff --git a/tests/pillar/prometheus_alertmanager.sls b/tests/pillar/alertmanager.sls
similarity index 81%
rename from tests/pillar/prometheus_alertmanager.sls
rename to tests/pillar/alertmanager.sls
index 48a9d5d..092e788 100644
--- a/tests/pillar/prometheus_alertmanager.sls
+++ b/tests/pillar/alertmanager.sls
@@ -1,9 +1,12 @@
 prometheus:
   alertmanager:
     enabled: true
+    dir:
+      config: /srv/volumes/prometheus
     bind:
       address: 0.0.0.0
       port: 9093
+    external_port: 15011
     config:
       global:
         resolve_timeout: 5m
@@ -34,3 +37,12 @@
           webhook_configs:
             - url: http://127.0.0.1
               send_resolved: true
+docker:
+  host:
+    enabled: true
+    experimental: true
+    insecure_registries:
+      - 127.0.0.1
+    log:
+      engine: json-file
+      size: 50m
\ No newline at end of file
diff --git a/tests/pillar/prometheus_server.sls b/tests/pillar/prometheus_server.sls
deleted file mode 100644
index c967b8f..0000000
--- a/tests/pillar/prometheus_server.sls
+++ /dev/null
@@ -1,30 +0,0 @@
-prometheus:
-  server:
-    enabled: true
-    bind:
-      port: 9090
-      address: 0.0.0.0
-    storage:
-      local:
-        engine: "persisted"
-        retention: "360h"
-        memory_chunks: 1048576
-        max_chunks_to_persist: 524288
-        num_fingerprint_mutexes: 4096
-    alertmanager:
-      notification_queue_capacity: 10000
-    config:
-      global:
-        scrape_interval: "15s"
-        scrape_timeout: "15s"
-        evaluation_interval: "1m"
-        external_labels:
-          region: 'region1'
-    alert:
-      PrometheusTargetDownKubernetesNodes:
-        if: 'up{job="kubernetes-nodes"} != 1'
-        labels:
-          severity: down
-          service: prometheus
-        annotations:
-          summary: 'Prometheus target down'
diff --git a/tests/pillar/prometheus_pushgateway.sls b/tests/pillar/pushgateway.sls
similarity index 79%
rename from tests/pillar/prometheus_pushgateway.sls
rename to tests/pillar/pushgateway.sls
index 873daa2..583fcde 100644
--- a/tests/pillar/prometheus_pushgateway.sls
+++ b/tests/pillar/pushgateway.sls
@@ -4,3 +4,4 @@
     bind:
       address: 0.0.0.0
       port: 9091
+    external_port: 15012
diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
new file mode 100644
index 0000000..9882410
--- /dev/null
+++ b/tests/pillar/server.sls
@@ -0,0 +1,79 @@
+prometheus:
+  server:
+    enabled: true
+    dir:
+      config: /srv/volumes/prometheus
+      config_in_container: /opt/prometheus/config
+    bind:
+      port: 9090
+      address: 0.0.0.0
+    external_port: 15010
+    target:
+      dns:
+        enabled: true
+        endpoint:
+          - name: 'pushgateway'
+            domain:
+            - 'tasks.prometheus_pushgateway'
+            type: A
+            port: 9091
+          - name: 'prometheus'
+            domain:
+            - 'tasks.prometheus_server'
+            type: A
+            port: 9090
+      kubernetes:
+        enabled: true
+        api_ip: 127.0.0.1
+        ssl_dir: /opt/prometheus/config
+        cert_name: prometheus-server.crt
+        key_name: prometheus-server.key
+      etcd:
+        endpoint:
+          scheme: https
+          ssl_dir: /opt/prometheus/config
+          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}
+    recording:
+      instance:fd_utilization:
+        query: >-
+          process_open_fds / process_max_fds
+    alert:
+      PrometheusTargetDown:
+        if: 'up != 1'
+        labels:
+          severity: down
+        annotations:
+          summary: 'Prometheus target down'
+    storage:
+      local:
+        engine: "persisted"
+        retention: "360h"
+        memory_chunks: 1048576
+        max_chunks_to_persist: 524288
+        num_fingerprint_mutexes: 4096
+    alertmanager:
+      notification_queue_capacity: 10000
+    config:
+      global:
+        scrape_interval: "15s"
+        scrape_timeout: "15s"
+        evaluation_interval: "1m"
+        external_labels:
+          region: 'region1'
+docker:
+  host:
+    enabled: true
+    experimental: true
+    insecure_registries:
+      - 127.0.0.1
+    log:
+      engine: json-file
+      size: 50m
\ No newline at end of file