diff --git a/release/70-openstack-operator.yaml b/release/70-openstack-operator.yaml index d00ed55..f6aa312 100644 --- a/release/70-openstack-operator.yaml +++ b/release/70-openstack-operator.yaml @@ -11,7 +11,7 @@ spec: - name: openstack-operator chart: openstack-controller/openstack-operator helmV3: true - version: 0.15.10 + version: 0.16.0 namespace: osh-system values: global: @@ -20,7 +20,7 @@ spec: podNetworks: - cidr: 192.168.0.0/16 image: - tag: 0.15.10 + tag: 0.16.0 # The kopf peering object will be created by ceph controller. kopf: enabled: false diff --git a/release/ci/25-prometheus.yaml b/release/ci/25-prometheus.yaml index 1f57585..9434f48 100644 --- a/release/ci/25-prometheus.yaml +++ b/release/ci/25-prometheus.yaml @@ -98,6 +98,33 @@ spec: scheme: http scrape_interval: 15s scrape_timeout: 10s + openstack-neutron-portprober: + honor_timestamps: true + kubernetes_sd_configs: + - namespaces: + names: + - openstack + role: endpoints + metric_relabel_configs: + - action: labeldrop + regex: node + - action: keep + regex: portprober_arping_target_total|portprober_arping_target_success|portprober_arping_target_failure + source_labels: + - __name__ + metrics_path: / + relabel_configs: + - action: keep + regex: neutron-portprober-exporter;qpp-exporter + source_labels: + - __meta_kubernetes_service_name + - __meta_kubernetes_endpoint_port_name + - source_labels: + - __meta_kubernetes_pod_node_name + target_label: node + scheme: http + scrape_interval: 15s + scrape_timeout: 10s # Deploy grafana together with prometheus, to make the same setup # as used on bm environments to measure workload downtimes. Grafana # is deployed without dashboards to decrease memory usage (sidecar @@ -202,4 +229,4 @@ spec: prometheus: isDefault: true type: prometheus - url: http://prometheus-server \ No newline at end of file + url: http://prometheus-server