Merge "Enable multiworker setup of contrail-api"
diff --git a/opencontrail/meta/heka.yml b/opencontrail/meta/heka.yml
index 0667088..08f1937 100644
--- a/opencontrail/meta/heka.yml
+++ b/opencontrail/meta/heka.yml
@@ -22,7 +22,7 @@
'contrail-svc-monitor',
) %}
{%- if config.get('ifmap', {}).get('engine', 'irond') == 'irond' %}
- {%- set control_processes += ('contrail-ifmap-server', 'contrail-irond',) %}
+ {%- set control_processes = control_processes + ('contrail-ifmap-server', 'contrail-irond',) %}
{%- endif %}
{%- endif %}
{%- if database.get('enabled', False) %}
diff --git a/opencontrail/meta/prometheus.yml b/opencontrail/meta/prometheus.yml
index ab254af..72a87d0 100644
--- a/opencontrail/meta/prometheus.yml
+++ b/opencontrail/meta/prometheus.yml
@@ -49,7 +49,7 @@
) %}
{%- if config.get('ifmap', {}).get('engine', 'irond') == 'irond' %}
- {%- set control_processes += ('contrail-ifmap-server', 'contrail-irond',) %}
+ {%- set control_processes = control_processes + ('contrail-ifmap-server', 'contrail-irond',) %}
{%- endif %}
{%- for api in control_apis %}
@@ -519,46 +519,56 @@
{%- endif %}
{%- if database.get('enabled', False) %}
- ZookeeperInfo:
+ ZookeeperServiceDown:
if: >-
- zookeeper_up != 1
+ zookeeper_up == 0
for: 2m
labels:
- severity: info
+ severity: minor
service: zookeeper
annotations:
- summary: 'Zookeeper service down'
- description: 'Zookeeper service is down on node {% raw %}{{ $labels.host }}{% endraw %}.'
- ZookeeperWarning:
+ summary: "Zookeeper service is down"
+ description: "The Zookeeper service on the {% raw %}{{ $labels.host }}{% endraw %} node is down for at least 2 minutes."
+ ZookeeperServiceError:
if: >-
- count(zookeeper_up == 0) >= count(zookeeper_up) * {{ monitoring.services_failed_warning_threshold_percent }}
+ zookeeper_service_health == 0
for: 2m
labels:
severity: warning
service: zookeeper
annotations:
- summary: "More than {{monitoring.services_failed_warning_threshold_percent*100}}% of Zookeeper services are down"
- description: "More than {{monitoring.services_failed_warning_threshold_percent*100}}% of Zookeeper services are down"
- ZookeeperCritical:
+ summary: "Zookeeper service error"
+ description: "The Zookeeper service on the {% raw %}{{ $labels.host }}{% endraw %} node is not responding for at least 2 minutes."
+ ZookeeperServicesDownMinor:
+ if: >-
+ count(zookeeper_up == 0) >= count(zookeeper_up) * {{ monitoring.services_failed_warning_threshold_percent }}
+ for: 2m
+ labels:
+ severity: minor
+ service: zookeeper
+ annotations:
+ summary: "{{ monitoring.services_failed_warning_threshold_percent*100 }}% of Zookeeper services are down"
+ description: "{% raw %}{{ $value }}{% endraw %} Zookeeper services are down (at least {{ monitoring.services_failed_warning_threshold_percent*100 }}%) for at least 2 minutes."
+ ZookeeperServicesDownMajor:
if: >-
count(zookeeper_up == 0) >= count(zookeeper_up) * {{ monitoring.services_failed_critical_threshold_percent }}
for: 2m
labels:
+ severity: major
+ service: zookeeper
+ annotations:
+ summary: "{{ monitoring.services_failed_critical_threshold_percent*100 }}% of Zookeeper services are down"
+ description: "{% raw %}{{ $value }}{% endraw %} Zookeeper services are down (at least {{ monitoring.services_failed_critical_threshold_percent*100 }}%) for at least 2 minutes."
+ ZookeeperServiceOutage:
+ if: >-
+ count(zookeeper_up == 0) == count(zookeeper_up)
+ for: 2m
+ labels:
severity: critical
service: zookeeper
annotations:
- summary: "More than {{monitoring.services_failed_critical_threshold_percent*100}}% of Zookeeper services are down"
- description: "More than {{monitoring.services_failed_critical_threshold_percent*100}}% of Zookeeper services are down"
- ZookeeperDown:
- if: >-
- count(zookeeper_up == 0) == count(zookeeper_up)
- for: 2m
- labels:
- severity: down
- service: zookeeper
- annotations:
- summary: 'All Zookeeper services are down'
- description: 'All Zookeeper services are down'
+ summary: "Zookeeper service outage"
+ description: "All Zookeeper services are down for at least 2 minutes."
{%- endif %}
{%- if exporters is defined %}