Merge changes from topic 'fix-exporters-config'
* changes:
Add Grafana dashboard with Prometheus datasource
Fix jmx exporter configuration to be generic
diff --git a/opencontrail/meta/prometheus.yml b/opencontrail/meta/prometheus.yml
index 73785bd..0904554 100644
--- a/opencontrail/meta/prometheus.yml
+++ b/opencontrail/meta/prometheus.yml
@@ -129,7 +129,7 @@
description: 'There are no active BGP sessions on node {{ $labels.host }}'
ContrailBGPSessionsSomeDown:
if: >-
- min(contrail_bgp_session_down_count) >= 0
+ min(contrail_bgp_session_down_count) > 0
for: 2m
labels:
severity: warning
@@ -159,7 +159,7 @@
description: 'There are no active XMPP sessions on node {{ $labels.host }}'
ContrailXMPPSessionsSomeDown:
if: >-
- min(contrail_xmpp_session_down_count) >= 0
+ min(contrail_xmpp_session_down_count) > 0
for: 2m
labels:
severity: warning
@@ -290,16 +290,6 @@
annotations:
summary: 'Number of vRouter DNS-XMPP sessions changed between checks is too high'
description: 'There are too many vRouter DNS-XMPP sessions changes on node {{ $labels.host }}'
- ContrailVrouterLLSSessionsNone:
- if: >-
- max(contrail_vrouter_lls) == 0
- for: 2m
- labels:
- severity: warning
- service: contrail-compute
- annotations:
- summary: 'No vRouter LLS sessions'
- description: 'There are no vRouter LLS sessions on node {{ $labels.host }}'
ContrailVrouterLLSSessionsTooMany:
if: >-
min(contrail_vrouter_lls) >= 10
@@ -319,16 +309,6 @@
annotations:
summary: 'Number of vRouter LLS sessions changed between checks is too high'
description: 'There are too many vRouter LLS sessions changes on node {{ $labels.host }}'
- ContrailFlowsActiveNone:
- if: >-
- min(contrail_vrouter_flows_active) == 0
- for: 2m
- labels:
- severity: warning
- service: contrail-compute
- annotations:
- summary: 'No active vRouter flows'
- description: 'There are no active vRouter flows on node {{ $labels.host }}'
ContrailFlowsActiveTooMany:
if: >-
min(contrail_vrouter_flows_active) >= 1200