Skip to content

Commit 14e8dd8

Browse files
cloudnullcloudnull
authored
Merge branch 'main' into smoke-test-build
2 parents 8d8685d + 20f7461 commit 14e8dd8

36 files changed

+601
-384
lines changed

‎.github/workflows/helm-prometheus.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
--create-namespace \
3333
--namespace=prometheus \
3434
-f ${{ github.workspace }}//base-helm-configs/prometheus/prometheus-helm-overrides.yaml \
35-
-f ${{ github.workspace }}//base-helm-configs/prometheus/alerting_rules.yaml \
35+
-f ${{ github.workspace }}//base-helm-configs/prometheus/rules/alerting_rules.yaml \
36+
-f ${{ github.workspace }}//base-helm-configs/prometheus/rules/rabbitmq_alerting_rules.yaml \
3637
-f ${{ github.workspace }}//base-helm-configs/prometheus/alertmanager_config.yaml \
3738
--post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
3839
--post-renderer-args prometheus/${{ matrix.overlays }} > /tmp/rendered.yaml

‎.original-images.json

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
[
2-
"quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy",
3-
"docker.io/rabbitmq:3.13-management",
42
"docker.io/docker:17.07.0",
5-
"docker.io/xrally/xrally-openstack:2.0.0",
6-
"docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy",
7-
"docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
8-
"docker.io/openstackhelm/designate:2024.1-ubuntu_jammy",
3+
"docker.io/kolla/centos-source-openvswitch-vswitchd:master",
4+
"docker.io/kolla/ubuntu-source-nova-compute-ironic:master",
5+
"docker.io/library/postgres:14.5",
6+
"docker.io/library/postgres:14.5",
97
"docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy",
108
"docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
9+
"docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
10+
"docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy",
11+
"docker.io/openstackhelm/designate:2024.1-ubuntu_jammy",
1112
"docker.io/openstackhelm/glance:2024.1-ubuntu_jammy",
12-
"docker.io/library/postgres:14.5",
1313
"docker.io/openstackhelm/horizon:2023.1-ubuntu_jammy",
14+
"docker.io/openstackhelm/magnum:2024.1-ubuntu_jammy",
15+
"docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy",
1416
"docker.io/openstackhelm/osh-selenium:latest-ubuntu_jammy",
1517
"docker.io/openstackhelm/ospurge:latest",
16-
"ghcr.io/vexxhost/netoffload:v1.0.1",
17-
"docker.io/kolla/ubuntu-source-nova-compute-ironic:master",
18-
"gcr.io/google_containers/hyperkube-amd64:v1.11.6",
19-
"docker.io/kolla/centos-source-openvswitch-vswitchd:master",
2018
"docker.io/openstackhelm/placement:2024.1-ubuntu_jammy",
21-
"docker.io/library/postgres:14.5",
19+
"docker.io/rabbitmq:3.13-management",
2220
"docker.io/wrouesnel/postgres_exporter:v0.4.6",
23-
"quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic",
24-
"docker.io/openstackhelm/magnum:2024.1-ubuntu_jammy",
25-
"docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy",
21+
"docker.io/xrally/xrally-openstack:2.0.0",
22+
"gcr.io/google_containers/hyperkube-amd64:v1.11.6",
2623
"ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy-1738626813",
2724
"ghcr.io/rackerlabs/genestack/cinder-volume-rxt:2024.1-ubuntu_jammy-1731085441",
2825
"ghcr.io/rackerlabs/genestack/glance:2024.1-ubuntu_jammy-1740121591",
2926
"ghcr.io/rackerlabs/genestack/gnocchi:2024.1-ubuntu_jammy-1738626728",
3027
"ghcr.io/rackerlabs/genestack/heat:2024.1-ubuntu_jammy-1738626724",
3128
"ghcr.io/rackerlabs/genestack/neutron-oslodb:2024.1-ubuntu_jammy-1738626982",
3229
"ghcr.io/rackerlabs/genestack/neutron-oslodb:2024.1-ubuntu_jammy-1739651767",
30+
"ghcr.io/rackerlabs/genestack/neutron-oslodb:2024.1-ubuntu_jammy-1742943886",
3331
"ghcr.io/rackerlabs/genestack/nova-efi:2024.1-ubuntu_jammy-1737928811",
3432
"ghcr.io/rackerlabs/genestack/octavia-ovn:2024.1-ubuntu_jammy-1737651745",
3533
"ghcr.io/rackerlabs/keystone-rxt:2024.1-ubuntu_jammy-1739377879",
36-
"ghcr.io/rackerlabs/skyline-rxt:master-ubuntu_jammy-1739967315"
34+
"ghcr.io/rackerlabs/skyline-rxt:master-ubuntu_jammy-1739967315",
35+
"ghcr.io/vexxhost/netoffload:v1.0.1",
36+
"quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy",
37+
"quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic"
3738
]

‎base-helm-configs/barbican/barbican-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ conf:
3333
connection_recycle_time: 600
3434
connection_trace: true
3535
idle_timeout: 3600
36-
mysql_sql_mode: ""
36+
mysql_sql_mode: {}
3737
use_db_reconnect: true
3838
pool_timeout: 60
3939
max_retries: -1

‎base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ conf:
4444
connection_recycle_time: 600
4545
connection_trace: true
4646
idle_timeout: 3600
47-
mysql_sql_mode: ""
47+
mysql_sql_mode: {}
4848
use_db_reconnect: true
4949
pool_timeout: 60
5050
max_retries: -1

‎base-helm-configs/cinder/cinder-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ conf:
9393
connection_recycle_time: 600
9494
connection_trace: true
9595
idle_timeout: 3600
96-
mysql_sql_mode: ""
96+
mysql_sql_mode: {}
9797
use_db_reconnect: true
9898
pool_timeout: 60
9999
max_retries: -1

‎base-helm-configs/designate/designate-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ conf:
465465
connection_recycle_time: 600
466466
connection_trace: true
467467
idle_timeout: 3600
468-
mysql_sql_mode: ""
468+
mysql_sql_mode: {}
469469
use_db_reconnect: true
470470
pool_timeout: 60
471471
max_retries: -1

‎base-helm-configs/glance/glance-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ conf:
9191
connection_recycle_time: 600
9292
connection_trace: true
9393
idle_timeout: 3600
94-
mysql_sql_mode: ""
94+
mysql_sql_mode: {}
9595
use_db_reconnect: true
9696
pool_timeout: 60
9797
max_retries: -1

‎base-helm-configs/grafana/grafana-helm-overrides.yaml

+79-93
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
# Set the custom_host variable to the desired hostname for Grafana
2-
# This is used to set the domain and root_url in the grafana.ini file
3-
# and the value of the custom_host variable must be a valid domain.
1+
---
42
custom_host: grafana.example.com
5-
63
persistence:
74
type: pvc
85
enabled: true
9-
storageClassName: general
106
accessModes:
117
- ReadWriteMany
12-
138
nodeSelector:
149
openstack-control-plane: enabled
15-
1610
ingress:
1711
enabled: false
18-
1912
image:
20-
tag: "10.3.3"
21-
13+
tag: 10.3.3
2214
grafana.ini:
2315
paths:
2416
data: /var/lib/grafana/
@@ -32,99 +24,95 @@ grafana.ini:
3224
grafana_net:
3325
url: https://grafana.net
3426
server:
35-
domain: "{{ .Values.custom_host }}" # Ref: custom_host variable above
36-
root_url: "https://{{ .Values.custom_host }}" # Ref: custom_host variable above
27+
domain: "{{ .Values.custom_host }}"
28+
root_url: https://{{ .Values.custom_host }}
3729
database:
3830
type: mysql
3931
host: mariadb-cluster.grafana.svc:3306
4032
user: $__file{/etc/secrets/grafana-db/username}
41-
password: $__file{/etc/secrets/grafana-db/password}
33+
password: $__file{/etc/secrets/grafana-db/password}
4234
name: grafana
43-
4435
datasources:
4536
datasources.yaml:
4637
apiversion: 1
4738
datasources:
48-
- name: Prometheus
49-
type: prometheus
50-
access: proxy
51-
url: http://kube-prometheus-stack-prometheus.prometheus.svc.cluster.local:9090
52-
isdefault: true
53-
- name: Loki
54-
type: loki
55-
access: proxy
56-
url: http://loki-gateway.{{ $.Release.Namespace }}.svc.cluster.local:80
57-
editable: false
58-
39+
- name: Prometheus
40+
type: prometheus
41+
access: proxy
42+
url: http://kube-prometheus-stack-prometheus.prometheus.svc.cluster.local:9090
43+
isdefault: true
44+
- name: Loki
45+
type: loki
46+
access: proxy
47+
url: http://loki-gateway.{{ $.Release.Namespace }}.svc.cluster.local:80
48+
editable: false
5949
alerting:
6050
rules.yaml:
6151
groups:
62-
- orgId: 1
63-
name: loki 1 min eval
64-
folder: rules
65-
interval: 1m
66-
rules:
67-
- uid: ba943125-33ca-4e4e-85f8-13359a8e4d65
68-
title: OVN claim storm
69-
condition: B
70-
data:
71-
- refId: A
52+
- orgId: 1
53+
name: loki 1 min eval
54+
folder: rules
55+
interval: 1m
56+
rules:
57+
- uid: ba943125-33ca-4e4e-85f8-13359a8e4d65
58+
title: OVN claim storm
59+
condition: B
60+
data:
61+
- refId: A
62+
queryType: instant
63+
relativeTimeRange:
64+
from: 60
65+
to: 0
66+
datasourceUid: P8E80F9AEF21F6940
67+
model:
68+
editorMode: builder
69+
expr: rate({app="ovs"} |= `binding|INFO|cr-lrp` [1m])
70+
intervalMs: 60000
71+
maxDataPoints: 43200
7272
queryType: instant
73-
relativeTimeRange:
74-
from: 60
75-
to: 0
76-
datasourceUid: P8E80F9AEF21F6940
77-
model:
78-
editorMode: builder
79-
expr: rate({app="ovs"} |= `binding|INFO|cr-lrp` [1m])
80-
intervalMs: 60000
81-
maxDataPoints: 43200
82-
queryType: instant
83-
refId: A
84-
- refId: B
85-
relativeTimeRange:
86-
from: 60
87-
to: 0
88-
datasourceUid: __expr__
89-
model:
90-
conditions:
91-
- evaluator:
92-
params:
93-
- 1
94-
- 0
95-
type: gt
96-
operator:
97-
type: and
98-
query:
99-
params: []
100-
reducer:
101-
params: []
102-
type: avg
103-
type: query
104-
datasource:
105-
name: Expression
106-
type: __expr__
107-
uid: __expr__
108-
expression: A
109-
intervalMs: 1000
110-
maxDataPoints: 43200
111-
refId: B
112-
type: threshold
113-
noDataState: OK
114-
execErrState: Error
115-
for: 0s
116-
notifications:
117-
- uid: prom-alertmanager-notification
118-
annotations:
119-
description: >-
120-
Checks app=ovs (ovs-ovn) pod logs for lines with string
121-
'binding|INFO|cr-lrp'
122-
summary: >-
123-
This alerts on rapid port claims for cr-lrp ports on OVN
124-
gateway nodes, which overloads the OVN south database and
125-
interferes with the function of the affected ports.
126-
labels: {}
127-
isPaused: false
73+
refId: A
74+
- refId: B
75+
relativeTimeRange:
76+
from: 60
77+
to: 0
78+
datasourceUid: __expr__
79+
model:
80+
conditions:
81+
- evaluator:
82+
params:
83+
- 1
84+
- 0
85+
type: gt
86+
operator:
87+
type: and
88+
query:
89+
params: []
90+
reducer:
91+
params: []
92+
type: avg
93+
type: query
94+
datasource:
95+
name: Expression
96+
type: __expr__
97+
uid: __expr__
98+
expression: A
99+
intervalMs: 1000
100+
maxDataPoints: 43200
101+
refId: B
102+
type: threshold
103+
noDataState: OK
104+
execErrState: Error
105+
for: 0s
106+
notifications:
107+
- uid: prom-alertmanager-notification
108+
annotations:
109+
description: Checks app=ovs (ovs-ovn) pod logs for lines with string
110+
'binding|INFO|cr-lrp'
111+
summary: This alerts on rapid port claims for cr-lrp ports on OVN gateway nodes,
112+
which overloads the OVN south database and interferes with the
113+
function of the affected ports.
114+
labels: {}
115+
isPaused: false
128116
contactpoints.yaml:
129117
secret:
130118
apiVersion: 1
@@ -146,13 +134,11 @@ alerting:
146134
group_wait: 1s
147135
group_interval: 1s
148136
repeat_interval: 1s
149-
150137
plugins:
151138
- camptocamp-prometheus-alertmanager-datasource
152-
153139
extraSecretMounts:
154140
- name: grafana-db-secret-mount
155141
secretName: grafana-db
156-
defaultMode: 0440
142+
defaultMode: 440
157143
mountPath: /etc/secrets/grafana-db
158144
readOnly: true

‎base-helm-configs/heat/heat-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ conf:
3131
connection_recycle_time: 600
3232
connection_trace: true
3333
idle_timeout: 3600
34-
mysql_sql_mode: ""
34+
mysql_sql_mode: {}
3535
use_db_reconnect: true
3636
pool_timeout: 60
3737
max_retries: -1

‎base-helm-configs/keystone/keystone-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ conf:
4242
connection_recycle_time: 600
4343
connection_trace: true
4444
idle_timeout: 3600
45-
mysql_sql_mode: ""
45+
mysql_sql_mode: {}
4646
use_db_reconnect: true
4747
pool_timeout: 60
4848
max_retries: -1

‎base-helm-configs/magnum/magnum-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ conf:
3232
connection_recycle_time: 600
3333
connection_trace: true
3434
idle_timeout: 3600
35-
mysql_sql_mode: ""
35+
mysql_sql_mode: {}
3636
use_db_reconnect: true
3737
pool_timeout: 60
3838
max_retries: -1

‎base-helm-configs/neutron/neutron-helm-overrides.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ conf:
100100
connection_recycle_time: 600
101101
connection_trace: true
102102
idle_timeout: 3600
103-
mysql_sql_mode: ""
103+
mysql_sql_mode: {}
104104
use_db_reconnect: true
105105
pool_timeout: 60
106106
max_retries: -1

‎base-helm-configs/nova/nova-helm-overrides.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ conf:
111111
connection_recycle_time: 600
112112
connection_trace: true
113113
idle_timeout: 3600
114-
mysql_sql_mode: ""
114+
mysql_sql_mode: {}
115115
use_db_reconnect: true
116116
pool_timeout: 60
117117
max_retries: -1
@@ -120,7 +120,7 @@ conf:
120120
connection_recycle_time: 600
121121
connection_trace: true
122122
idle_timeout: 3600
123-
mysql_sql_mode: ""
123+
mysql_sql_mode: {}
124124
use_db_reconnect: true
125125
pool_timeout: 60
126126
max_retries: -1
@@ -133,7 +133,7 @@ conf:
133133
connection_recycle_time: 600
134134
connection_trace: true
135135
idle_timeout: 3600
136-
mysql_sql_mode: ""
136+
mysql_sql_mode: {}
137137
use_db_reconnect: true
138138
pool_timeout: 60
139139
max_retries: -1

0 commit comments

Comments
 (0)