Merge "Change some default values for Rabbit driver"
diff --git a/octavia/files/grafana_dashboards/octavia_prometheus.json b/octavia/files/grafana_dashboards/octavia_prometheus.json
index 4915794..8e7cf3a 100644
--- a/octavia/files/grafana_dashboards/octavia_prometheus.json
+++ b/octavia/files/grafana_dashboards/octavia_prometheus.json
@@ -72,16 +72,15 @@
"tableColumn": "",
"targets": [
{
- "expr": "min(openstack_api_check_status{service=~\"octavia.*\"})",
+ "expr": "openstack_api_check_status{interface=\"public\",service_name=~\"octavia.*\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{ service }}",
"refId": "A",
"step": 60
}
],
"thresholds": "1,0",
- "title": "API Availability",
+ "title": "Public VIP API Availability",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
@@ -859,4 +858,3 @@
"version": 1
}
{%- endraw -%}
-
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index 4c73b8b..a087859 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -658,10 +658,10 @@
timeout_client_data = {{ manager.haproxy_amphora.timeout_client_data }}
# member connection timeout.
-timeout_client_data = {{ manager.haproxy_amphora.timeout_member_connect }}
+timeout_member_connect = {{ manager.haproxy_amphora.timeout_member_connect }}
# member inactivity timeout.
-timeout_client_data = {{ manager.haproxy_amphora.timeout_member_data }}
+timeout_member_data = {{ manager.haproxy_amphora.timeout_member_data }}
# Retry threshold for waiting for a build slot for an amphorae.
#build_active_retries=300
diff --git a/octavia/files/rocky/octavia_manager.conf b/octavia/files/rocky/octavia_manager.conf
index 28178c7..3d9dd8b 100644
--- a/octavia/files/rocky/octavia_manager.conf
+++ b/octavia/files/rocky/octavia_manager.conf
@@ -354,10 +354,10 @@
timeout_client_data = {{ manager.haproxy_amphora.timeout_client_data }}
# member connection timeout.
-timeout_client_data = {{ manager.haproxy_amphora.timeout_member_connect }}
+timeout_member_connect = {{ manager.haproxy_amphora.timeout_member_connect }}
# member inactivity timeout.
-timeout_client_data = {{ manager.haproxy_amphora.timeout_member_data }}
+timeout_member_data = {{ manager.haproxy_amphora.timeout_member_data }}
# Number of amphorae that could be built per controller worker, simultaneously.
#build_rate_limit=-1
diff --git a/octavia/meta/prometheus.yml b/octavia/meta/prometheus.yml
index 9085c9e..f7b60c2 100644
--- a/octavia/meta/prometheus.yml
+++ b/octavia/meta/prometheus.yml
@@ -3,19 +3,6 @@
{%- if api.get('enabled', False) %}
server:
alert:
-{%- raw %}
- OctaviaApiDown:
- if: >-
- max(openstack_api_check_status{service="octavia-api"}) == 0
- for: 2m
- labels:
- severity: critical
- service: octavia
- annotations:
- summary: "Octavia API outage"
- description: >-
- Octavia API is not accessible for all available Octavia endpoints in the OpenStack service catalog for 2 minutes.
-{%- endraw %}
OctaviaErrorLogsTooHigh:
{%- set log_threshold = monitoring.error_log_rate|float %}
if: >-