Merge pull request #192 from grafana/dev

Merge dev to main

engine/settings/helm.py

@@ -26,8 +26,9 @@ RABBITMQ_USERNAME = os.environ.get("RABBITMQ_USERNAME")
 RABBITMQ_PASSWORD = os.environ.get("RABBITMQ_PASSWORD")
 RABBITMQ_HOST = os.environ.get("RABBITMQ_HOST")
 RABBITMQ_PORT = os.environ.get("RABBITMQ_PORT")
+RABBITMQ_PROTOCOL = os.environ.get("RABBITMQ_PROTOCOL")
 
-CELERY_BROKER_URL = f"amqp://{RABBITMQ_USERNAME}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}"
+CELERY_BROKER_URL = f"{RABBITMQ_PROTOCOL}://{RABBITMQ_USERNAME}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}"
 
 REDIS_PASSWORD = os.environ.get("REDIS_PASSWORD")
 REDIS_HOST = os.environ.get("REDIS_HOST")

helm/oncall/Chart.yaml

@@ -8,7 +8,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -40,4 +40,4 @@ dependencies:
   - name: ingress-nginx
     version: 4.1.4
     repository: https://kubernetes.github.io/ingress-nginx
-    condition: ingress-nginx.enabled
+    condition: ingress-nginx.enabled

helm/oncall/templates/_env.tpl

@@ -104,6 +104,8 @@
   value: {{ include "snippet.rabbitmq.host" . }}
 - name: RABBITMQ_PORT
   value: {{ include "snippet.rabbitmq.port" . }}
+- name: RABBITMQ_PROTOCOL
+  value: {{ include "snippet.rabbitmq.protocol" . }}
 {{- end }}
 
 {{- define "snippet.rabbitmq.user" -}}
@@ -130,6 +132,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "snippet.rabbitmq.protocol" -}}
+{{- if and (not .Values.rabbitmq.enabled) .Values.externalRabbitmq.protocol -}}
+{{ .Values.externalRabbitmq.protocol | quote }}
+{{- else -}}
+"amqp"
+{{- end -}}
+{{- end -}}
+
 {{- define "snippet.rabbitmq.password.secret.name" -}}
 {{- if and (not .Values.rabbitmq.enabled) .Values.externalRabbitmq.password -}}
 {{ include "oncall.fullname" . }}-rabbitmq-external

helm/oncall/values.yaml

@@ -116,6 +116,7 @@ externalRabbitmq:
   port:
   user:
   password:
+  protocol:
 
 # Redis is included into this release for the convenience.
 # It is recommended to host it separately from this release