Merge "Add prometheus-es-exporter"
diff --git a/prometheus/meta/prometheus.yml b/prometheus/meta/prometheus.yml
index ebbf94e..dcce961 100644
--- a/prometheus/meta/prometheus.yml
+++ b/prometheus/meta/prometheus.yml
@@ -13,44 +13,7 @@
annotations:
summary: "Prometheus target is down"
description: "The Prometheus target for the {{ $labels.job }} job on the {{ or $labels.host $labels.instance }} node is down for 2 minutes."
- PrometheusTargetSamplesOrderWarning:
- if: increase(prometheus_target_scrapes_sample_out_of_order_total[1m]) > 0
- labels:
- severity: warning
- service: prometheus
- annotations:
- summary: "Prometheus samples are out of order"
- description: "{{ $value }} Prometheus samples on the {{ $labels.instance }} instance are out of order (as measured over the last minute)."
- PrometheusTargetSamplesBoundsWarning:
- if: increase(prometheus_target_scrapes_sample_out_of_bounds_total[1m]) > 0
- labels:
- severity: warning
- service: prometheus
- annotations:
- summary: "Prometheus samples timestamps are out of bounds"
- description: "{{ $value }} Prometheus samples on the {{ $labels.instance }} instance have timestamps out of bounds (as measured over the last minute)."
- PrometheusTargetSamplesDuplicateWarning:
- if: increase(prometheus_target_scrapes_sample_duplicate_timestamp_total[1m]) > 0
- labels:
- severity: warning
- service: prometheus
- annotations:
- summary: "Prometheus samples have duplicate timestamps"
- description: "{{ $value }} Prometheus samples on the {{ $labels.instance }} instance have duplicate timestamps (as measured over the last minute)."
{% endraw %}
-{%- if server.version == 1.7 %}
-{% raw %}
- PrometheusDataIngestionWarning:
- if: prometheus_local_storage_rushed_mode != 0
- for: 10m
- labels:
- severity: warning
- service: prometheus
- annotations:
- summary: "Prometheus is in the rushed mode"
- description: "The Prometheus service writes on the {{ $labels.instance }} instance do not keep up with data ingestion speed for 10 minutes."
-{% endraw %}
-{%- endif %}
{%- endif %}
{%- if server.get('config', {}).get('remote_write') %}
PrometheusRemoteStorageQueueFullWarning:
@@ -207,16 +170,6 @@
annotations:
summary: "Sf-notifier authentication failure"
description: "The sf-notifier service fails to authenticate to Salesforce for 2 minutes."
- SfNotifierErrorsWarning:
- if: >-
- increase(sf_error_count_total[2m]) > 0
- for: 2m
- labels:
- severity: warning
- service: sf-notifier
- annotations:
- summary: "Sf-notifier error rate increase"
- description: "An average of {{ $value }} sf-notifier error requests appear for 2 minutes."
{%- endraw %}
{%- endif %}
{%- if server.get("enabled", False) and not server.get("is_container", True) and relay.get('enabled', False) or sf_notifier.get('enabled', False) %}