Merge "Fix alerts"
diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 502d2aa..68d7901 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -192,7 +192,7 @@
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}
- - watch:
+ - watch:
{%- if config.version <= 3.0 %}
- file: /etc/contrail/contrail-discovery.conf
- file: /etc/ifmap-server/basicauthusers.properties
diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index 629b1ac..ceadd64 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -23,7 +23,7 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
-{%- if config.identity.engine == "keystone" %}
+{%- if config.identity.engine == "keystone" and not config.get('k8s_enabled', False) %}
auth=keystone
{%- endif %}
#rabbit_port=5673{{ config.message_queue.port }}
diff --git a/opencontrail/files/4.0/contrail-api.conf b/opencontrail/files/4.0/contrail-api.conf
index accbf49..acb2fc9 100644
--- a/opencontrail/files/4.0/contrail-api.conf
+++ b/opencontrail/files/4.0/contrail-api.conf
@@ -19,7 +19,7 @@
rabbit_server={{ config.message_queue.host }}
{%- endif %}
rabbit_port={{ config.message_queue.port }}
-{%- if config.identity.engine == "keystone" %}
+{%- if config.identity.engine == "keystone" and not config.get('k8s_enabled', False) %}
auth=keystone
{%- endif %}
#rabbit_port=5673
diff --git a/opencontrail/meta/prometheus.yml b/opencontrail/meta/prometheus.yml
index e789012..ed997a5 100644
--- a/opencontrail/meta/prometheus.yml
+++ b/opencontrail/meta/prometheus.yml
@@ -31,7 +31,7 @@
{%- if database.get('enabled', False) %}
{%- set database_processes = (
- 'zookeeper-server', 'kafka-server', 'cassandra-server',
+ 'kafka-server', 'cassandra-server',
'contrail-nodemgr-database', 'contrail-supervisord-database',
) %}
{%- endif %}
@@ -505,6 +505,20 @@
{%- endraw %}
{%- endfor %}
{%- endif %}
+
+ {%- if database.get('enabled', False) %}
+ ZookeeperDown:
+ if: >-
+ zookeeper_up != 1
+ for: 2m
+ labels:
+ severity: warning
+ service: zookeeper
+ annotations:
+ summary: 'Zookeeper service down'
+ description: 'Zookeeper service is down on node {{ $labels.host }}.'
+ {%- endif %}
+
{%- if exporters is defined %}
{%- include "prometheus/_exporters_config.sls" %}
{%- endif %}