From 567e4703e95989a89a624ec5b27cc17d9135f1a3 Mon Sep 17 00:00:00 2001 From: "Xiaoguang(William) Zhang" Date: Fri, 12 Feb 2021 14:43:59 -0500 Subject: [PATCH] Remove Alerta from openstack-helm-infra repository There is no significant value been added from Alerta base on current user story. Change-Id: I274263e3dfefd7b9ec8ff84d03504d194225d693 --- alerta/Chart.yaml | 25 --- alerta/requirements.yaml | 18 -- alerta/templates/bin/_create_db.sh.tpl | 65 ------ alerta/templates/configmap-bin.yaml | 30 --- alerta/templates/configmap-etc.yaml | 25 --- alerta/templates/create_db.yaml | 68 ------- alerta/templates/deployment.yaml | 102 ---------- alerta/templates/ingress.yaml | 18 -- alerta/templates/secret-ingress-tls.yaml | 17 -- alerta/templates/secret.yaml | 28 --- alerta/templates/service-ingress.yaml | 18 -- alerta/templates/service.yaml | 36 ---- alerta/values.yaml | 239 ----------------------- alerta/values_overrides/apparmor.yaml | 7 - prometheus-alertmanager/Chart.yaml | 2 +- prometheus-alertmanager/values.yaml | 27 +-- releasenotes/config.yaml | 1 - releasenotes/notes/alerta.yaml | 9 - tools/deployment/apparmor/175-alerta.sh | 33 ---- tools/deployment/common/alerta.sh | 33 ---- zuul.d/jobs.yaml | 3 - 21 files changed, 3 insertions(+), 801 deletions(-) delete mode 100644 alerta/Chart.yaml delete mode 100644 alerta/requirements.yaml delete mode 100644 alerta/templates/bin/_create_db.sh.tpl delete mode 100644 alerta/templates/configmap-bin.yaml delete mode 100644 alerta/templates/configmap-etc.yaml delete mode 100644 alerta/templates/create_db.yaml delete mode 100644 alerta/templates/deployment.yaml delete mode 100644 alerta/templates/ingress.yaml delete mode 100644 alerta/templates/secret-ingress-tls.yaml delete mode 100644 alerta/templates/secret.yaml delete mode 100644 alerta/templates/service-ingress.yaml delete mode 100644 alerta/templates/service.yaml delete mode 100644 alerta/values.yaml delete mode 100644 alerta/values_overrides/apparmor.yaml delete mode 100644 releasenotes/notes/alerta.yaml delete mode 100755 tools/deployment/apparmor/175-alerta.sh delete mode 100755 tools/deployment/common/alerta.sh diff --git a/alerta/Chart.yaml b/alerta/Chart.yaml deleted file mode 100644 index 4d0556cd1..000000000 --- a/alerta/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -apiVersion: v1 -appVersion: v8.0.2 -description: OpenStack-Helm Alerta for Alertmanager. -name: alerta -version: 0.1.5 -home: https://github.com/alerta/alerta -sources: - - https://github.com/alerta/alerta - - https://opendev.org/openstack/openstack-helm-infra -maintainers: - - name: OpenStack-Helm Authors -... diff --git a/alerta/requirements.yaml b/alerta/requirements.yaml deleted file mode 100644 index 19b0d6992..000000000 --- a/alerta/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- -dependencies: - - name: helm-toolkit - repository: http://localhost:8879/charts - version: ">= 0.1.0" -... diff --git a/alerta/templates/bin/_create_db.sh.tpl b/alerta/templates/bin/_create_db.sh.tpl deleted file mode 100644 index d89a29ed3..000000000 --- a/alerta/templates/bin/_create_db.sh.tpl +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -set -x - -ALERTA_DB_NAME={{ .Values.conf.alerta.alertadb }} - -function create_db() { - export PGPASSWORD=${ADMIN_PASSWORD} - if `psql -h ${DB_FQDN} -p ${DB_PORT} -U ${DB_ADMIN_USER} -lqt | cut -d \| -f 1 | grep -qw ${ALERTA_DB_NAME}`; then - echo "Database ${ALERTA_DB_NAME} is already exist." - else - echo "Database ${ALERTA_DB_NAME} not exist, create it." - psql_cmd "postgres" ${DB_ADMIN_USER} ${ADMIN_PASSWORD} "CREATE DATABASE ${ALERTA_DB_NAME};" - echo "Database ${ALERTA_DB_NAME} is created." - fi -} - - -function psql_cmd { - DATABASE=$1 - DB_USER=$2 - export PGPASSWORD=$3 - DB_COMMAND=$4 - EXIT_ON_FAIL=${5:-1} - - psql \ - -h $DB_FQDN \ - -p $DB_PORT \ - -U $DB_USER \ - -d $DATABASE \ - -v "ON_ERROR_STOP=1" \ - --command="${DB_COMMAND}" - - RC=$? - - if [[ $RC -ne 0 ]] - then - echo 'FAIL!' - if [[ $EXIT_ON_FAIL -eq 1 ]] - then - exit $RC - fi - fi - - return 0 -} - - -# Create db -sleep 10 -create_db -exit 0 \ No newline at end of file diff --git a/alerta/templates/configmap-bin.yaml b/alerta/templates/configmap-bin.yaml deleted file mode 100644 index 783d6d2e1..000000000 --- a/alerta/templates/configmap-bin.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.configmap_bin }} -{{- $envAll := . }} -{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "etcd-bin" }} ---- -apiVersion: v1 -{{/* Note: this is a secret because credentials must be rendered into the password script. */}} -kind: Secret -metadata: - name: alerta-bin -type: Opaque -data: -{{- if .Values.images.local_registry.active }} - image-repo-sync.sh: {{- include "helm-toolkit.scripts.image_repo_sync" . | b64enc }} -{{- end }} - create_db.sh: {{ tuple "bin/_create_db.sh.tpl" . | include "helm-toolkit.utils.template" | b64enc }} -{{- end }} diff --git a/alerta/templates/configmap-etc.yaml b/alerta/templates/configmap-etc.yaml deleted file mode 100644 index 239160621..000000000 --- a/alerta/templates/configmap-etc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.configmap_etc }} -{{- $envAll := . }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: alerta-etc -data: -{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.alerta.alertad_conf "key" "alertad.conf") | indent 2 }} -{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.alerta.alerta_webui_config "key" "config.js") | indent 2 }} -{{- end }} diff --git a/alerta/templates/create_db.yaml b/alerta/templates/create_db.yaml deleted file mode 100644 index 08ddb647a..000000000 --- a/alerta/templates/create_db.yaml +++ /dev/null @@ -1,68 +0,0 @@ -{{/* -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.create_db }} -{{- $envAll := . }} - ---- -apiVersion: v1 -kind: Pod -metadata: - name: alerta-create-db -spec: -{{ dict "envAll" $envAll "application" "alerta_create_db" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }} - restartPolicy: Never - containers: - - name: alerta-create-db -{{ tuple $envAll "alerta_create_db" | include "helm-toolkit.snippets.image" | indent 4 }} -{{ dict "envAll" $envAll "application" "alerta_create_db" "container" "alerta_create_db" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 4 }} - env: - - name: DB_FQDN - valueFrom: - secretKeyRef: - name: {{ .Values.secrets.postgresql.admin }} - key: DATABASE_HOST - - name: DB_PORT - valueFrom: - secretKeyRef: - name: {{ .Values.secrets.postgresql.admin }} - key: DATABASE_PORT - - name: DB_ADMIN_USER - valueFrom: - secretKeyRef: - name: {{ .Values.secrets.postgresql.admin }} - key: POSTGRES_USER - - name: ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.secrets.postgresql.admin }} - key: POSTGRES_PASSWORD - command: - - /tmp/create_db.sh - volumeMounts: - - name: pod-tmp - mountPath: /tmp - - name: alerta-bin - mountPath: /tmp/create_db.sh - subPath: create_db.sh - readOnly: true - volumes: - - name: pod-tmp - emptyDir: {} - - name: alerta-bin - secret: - secretName: alerta-bin - defaultMode: 0555 -{{- end }} diff --git a/alerta/templates/deployment.yaml b/alerta/templates/deployment.yaml deleted file mode 100644 index 68acb2133..000000000 --- a/alerta/templates/deployment.yaml +++ /dev/null @@ -1,102 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.deployment }} -{{- $envAll := . }} - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: alerta - annotations: - {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} - labels: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -spec: - podManagementPolicy: "Parallel" - replicas: {{ .Values.pod.replicas.alerta }} - selector: - matchLabels: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} - template: - metadata: - labels: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - annotations: -{{ dict "envAll" $envAll "podName" "alerta" "containerNames" (list "alerta") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} - spec: -{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} - affinity: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} - nodeSelector: - {{ .Values.labels.alerta.node_selector_key }}: {{ .Values.labels.alerta.node_selector_value | quote }} - terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.alerta.timeout | default "30" }} - containers: - - name: alerta -{{ tuple $envAll "alerta" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.alerta | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} -{{ dict "envAll" $envAll "application" "server" "container" "alerta" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - env: - - name: ADMIN_USERS - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-admin-user - - name: ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-admin-password - - name: ADMIN_KEY - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-admin-key - - name: ALERTA_API_KEY - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-api-key - ports: - - name: http - containerPort: 8080 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 180 - readinessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 120 - volumeMounts: - - name: alerta-etc - mountPath: /app/alertad.conf - subPath: alertad.conf - - name: alerta-etc - mountPath: /app/config.js - subPath: config.js - resources: -{{ toYaml .Values.pod.resources | indent 12 }} - volumes: - - name: alerta-etc - configMap: - name: alerta-etc - defaultMode: 0444 -{{- end }} diff --git a/alerta/templates/ingress.yaml b/alerta/templates/ingress.yaml deleted file mode 100644 index 54cc6404d..000000000 --- a/alerta/templates/ingress.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if and .Values.manifests.alerta.ingress .Values.network.alerta.ingress.public }} -{{- $ingressOpts := dict "envAll" . "backendService" "alerta" "backendServiceType" "alerta" "backendPort" "server" -}} -{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} -{{- end }} diff --git a/alerta/templates/secret-ingress-tls.yaml b/alerta/templates/secret-ingress-tls.yaml deleted file mode 100644 index dbadc748f..000000000 --- a/alerta/templates/secret-ingress-tls.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.secret_ingress_tls }} -{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "alerta" "backendService" "alerta" ) }} -{{- end }} diff --git a/alerta/templates/secret.yaml b/alerta/templates/secret.yaml deleted file mode 100644 index ebe3740ad..000000000 --- a/alerta/templates/secret.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.secret }} -{{- $envAll := . }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} -type: Opaque -data: - alerta-admin-user: {{ .Values.conf.alerta.alertaAdminUser | b64enc }} - alerta-admin-password: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} - alerta-admin-key: {{ .Values.conf.alerta.alertaAdminKey | b64enc }} - alerta-api-key: {{ .Values.conf.alerta.alertaAPIKey | b64enc }} -{{- end }} diff --git a/alerta/templates/service-ingress.yaml b/alerta/templates/service-ingress.yaml deleted file mode 100644 index 0e0571a13..000000000 --- a/alerta/templates/service-ingress.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if and .Values.manifests.alerta.service_ingress .Values.network.alerta.ingress.public }} -{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "alerta" -}} -{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} -{{- end }} diff --git a/alerta/templates/service.yaml b/alerta/templates/service.yaml deleted file mode 100644 index a17848928..000000000 --- a/alerta/templates/service.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.service }} -{{- $envAll := . }} ---- -apiVersion: v1 -kind: Service -metadata: - name: alerta -spec: - ports: - - name: server - {{ if .Values.network.alerta.node_port.enabled }} - nodePort: {{ .Values.network.alerta.node_port.port }} - {{ end }} - port: {{ tuple "alerta" "internal" "server" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - targetPort: http - protocol: TCP - selector: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} - {{ if .Values.network.alerta.node_port.enabled }} - type: NodePort - {{ end }} -{{- end }} diff --git a/alerta/values.yaml b/alerta/values.yaml deleted file mode 100644 index 70956711d..000000000 --- a/alerta/values.yaml +++ /dev/null @@ -1,239 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Default values for alerta. -# This is a YAML-formatted file. -# Declare name/value pairs to be passed into your templates. -# name: value - ---- - - -images: - tags: - alerta: docker.io/openstackhelm/alerta:8.0.2 - dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - image_repo_sync: docker.io/docker:17.07.0 - ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic - alerta_create_db: "docker.io/openstackhelm/patroni:latest-ubuntu_xenial" - pull_policy: IfNotPresent - local_registry: - active: false - exclude: - - dep_check - - image_repo_sync - -labels: - alerta: - node_selector_key: openstack-control-plane - node_selector_value: enabled - alerta_create_db: - node_selectory_key: openstack-control-plane - node_selector_value: enabled - -dependencies: - dynamic: - common: - local_image_registry: - jobs: - - alerta-postgresql-image-repo-sync - services: - - endpoint: node - service: local_image_registry - static: - alerta: - services: - - endpoint: internal - service: alerta-postgresql - alerta_create_db: - services: - - endpoint: internal - service: alerta-postgresql - image_repo_sync: - services: - - endpoint: internal - service: local_image_registry - -pod: - security_context: - alerta_create_db: - pod: - runAsUser: 65534 - container: - alerta_create_db: - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - server: - pod: - runAsUser: 0 - container: - alerta: - readOnlyRootFilesystem: false - affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname - weight: - default: 10 - replicas: - alerta: 1 - mounts: - alerta: - lifecycle: - upgrades: - deployments: - revision_history: 3 - pod_replacement_strategy: RollingUpdate - rolling_update: - max_unavailable: 1 - max_surge: 3 - termination_grace_period: - alerta: - timeout: 30 - resources: - alerta: - enabled: false - limits: - memory: "1024Mi" - cpu: "100m" - requests: - memory: "128Mi" - cpu: "100m" - -endpoints: - cluster_domain_suffix: cluster.local - local_image_registry: - name: docker-registry - namespace: docker-registry - hosts: - default: localhost - internal: docker-registry - node: localhost - host_fqdn_override: - default: null - port: - registry: - node: 5000 - alertmanager: - name: prometheus-alertmanager - namespace: null - hosts: - default: alerts-engine - host_fqdn_override: - default: null - path: - default: null - scheme: http - port: - api: - default: 9093 - alerta: - name: alerta - namespace: null - hosts: - default: alerta - public: alerta-public - host_fqdn_override: - default: null - path: - default: null - scheme: - default: 'http' - port: - server: - default: 8080 - postgresql: - auth: - admin: - username: postgres - password: password - hosts: - default: postgresql - host_fqdn_override: - default: null - path: /alerta_db - scheme: postgresql - port: - postgresql: - default: 5432 - -secrets: - postgresql: - admin: postgresql-admin - tls: - alerta: - alerta: - public: alerta-tls-public - -storage: [] - -volume: [] - -jobs: [] - -network: - alerta: - ingress: - public: true - classes: - namespace: "nginx" - cluster: "nginx-cluster" - annotations: - nginx.ingress.kubernetes.io/rewrite-target: / - nginx.ingress.kubernetes.io/affinity: cookie - nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-alerta - nginx.ingress.kubernetes.io/session-cookie-hash: sha1 - nginx.ingress.kubernetes.io/session-cookie-expires: "600" - nginx.ingress.kubernetes.io/session-cookie-max-age: "600" - node_port: - enabled: true - port: 30480 - -network_policy: [] - -manifests: - alerta: - configmap_bin: true - configmap_etc: true - deployment: true - ingress: false - secret: true - secret_ingress_tls: false - service: true - service_ingress: false - create_db: true - -conf: - alerta: - alertaAdminUser: admin - alertaAdminPassword: changeme - alertaAdminKey: changeme - alertaAPIKey: changeme - alertadb: alerta_db - alertad_conf: | - DEBUG = True - PLUGINS = ['enhance', 'forward', 'normalise', 'prometheus'] - ALERTMANAGER_SILENCE_FROM_ACK = True - ALERTMANAGER_API_URL = '{{ tuple "alertmanager" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}://{{ tuple "alertmanager" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}' - DATABASE_URL = {{ tuple "postgresql" "internal" "admin" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" |quote}} - alerta_webui_config: | - # ref: http://docs.alerta.io/en/latest/webui.html - 'use strict'; - angular.module('config', []) - .constant('config', { - 'endpoint' : "/api", - 'provider' : "basic" - }) - .constant('colors', {}); -... diff --git a/alerta/values_overrides/apparmor.yaml b/alerta/values_overrides/apparmor.yaml deleted file mode 100644 index c90f05e71..000000000 --- a/alerta/values_overrides/apparmor.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -pod: - mandatory_access_control: - type: apparmor - alerta: - alerta: runtime/default -... diff --git a/prometheus-alertmanager/Chart.yaml b/prometheus-alertmanager/Chart.yaml index 365994f0b..c4aa12c21 100644 --- a/prometheus-alertmanager/Chart.yaml +++ b/prometheus-alertmanager/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v0.20.0 description: OpenStack-Helm Alertmanager for Prometheus name: prometheus-alertmanager -version: 0.1.5 +version: 0.1.6 home: https://prometheus.io/docs/alerting/alertmanager/ sources: - https://github.com/prometheus/alertmanager diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index 9d690effc..f2c385e79 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -162,20 +162,6 @@ endpoints: port: ldap: default: 389 - alerta: - name: alerta - namespace: null - hosts: - default: alerta - host_fqdn_override: - default: null - path: - default: /api/webhooks/prometheus - scheme: - default: 'http' - port: - api: - default: 8080 dependencies: dynamic: @@ -390,7 +376,7 @@ conf: repeat_interval: 3h # A default receiver # receiver: team-X-mails - receiver: alerta + receiver: 'team-X-mails' # All the above attributes are inherited by all child routes and can # overwritten on each. # The child route trees. @@ -398,7 +384,7 @@ conf: # This routes performs a regular expression match on alert # labels to catch alerts that are related to a list of # services. - - receiver: "alerta" + - receiver: 'team-X-mails' continue: true - match_re: service: ^(foo1|foo2|baz)$ @@ -449,15 +435,6 @@ conf: - cluster - service receivers: - - name: 'alerta' - webhook_configs: - - send_resolved: true - #url: 'http://alerta:8080/api/webhooks/prometheus' - url: {{ tuple "alerta" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} - http_config: - basic_auth: - username: admin - password: changeme - name: 'team-X-mails' email_configs: - to: 'team-X+alerts@example.org' diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml index 1d2d7eff5..ca1691502 100644 --- a/releasenotes/config.yaml +++ b/releasenotes/config.yaml @@ -3,7 +3,6 @@ branch: master collapse_pre_releases: false stop_at_branch_base: true sections: - - [alerta, alerta Chart] - [ca-issuer, ca-issuer Chart] - [calico, calico Chart] - [ceph-client, ceph-client Chart] diff --git a/releasenotes/notes/alerta.yaml b/releasenotes/notes/alerta.yaml deleted file mode 100644 index 3e22d6a47..000000000 --- a/releasenotes/notes/alerta.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -alerta: - - 0.1.0 Initial Chart - - 0.1.1 Fix values reference in ingress manifests - - 0.1.2 Change helm-toolkit dependency version to ">= 0.1.0" - - 0.1.3 Alerta update to silence alert in Alertmanager - - 0.1.4 Add missing pod/container flags to alerta - - 0.1.5 Add pod/container security context template to create_db.yaml -... diff --git a/tools/deployment/apparmor/175-alerta.sh b/tools/deployment/apparmor/175-alerta.sh deleted file mode 100755 index e01e2842b..000000000 --- a/tools/deployment/apparmor/175-alerta.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Lint and package chart -make alerta - -#NOTE: Deploy command -: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} -: ${OSH_INFRA_EXTRA_HELM_ARGS_ALERTA:="$(./tools/deployment/common/get-values-overrides.sh alerta)"} - -helm upgrade --install alerta ./alerta \ - --namespace=osh-infra \ - ${OSH_INFRA_EXTRA_HELM_ARGS} \ - ${OSH_INFRA_EXTRA_HELM_ARGS_ALERTA} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status alerta diff --git a/tools/deployment/common/alerta.sh b/tools/deployment/common/alerta.sh deleted file mode 100755 index e01e2842b..000000000 --- a/tools/deployment/common/alerta.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -xe - -#NOTE: Lint and package chart -make alerta - -#NOTE: Deploy command -: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} -: ${OSH_INFRA_EXTRA_HELM_ARGS_ALERTA:="$(./tools/deployment/common/get-values-overrides.sh alerta)"} - -helm upgrade --install alerta ./alerta \ - --namespace=osh-infra \ - ${OSH_INFRA_EXTRA_HELM_ARGS} \ - ${OSH_INFRA_EXTRA_HELM_ARGS_ALERTA} - -#NOTE: Wait for deploy -./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status alerta diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 749644c94..5859e1cf1 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -90,7 +90,6 @@ - ./tools/deployment/multinode/140-kibana.sh - ./tools/deployment/multinode/160-zookeeper.sh - ./tools/deployment/multinode/170-postgresql.sh - - ./tools/deployment/multinode/175-alerta.sh - ./tools/deployment/multinode/600-grafana-selenium.sh || true - ./tools/deployment/multinode/610-nagios-selenium.sh || true - ./tools/deployment/multinode/620-prometheus-selenium.sh || true @@ -209,7 +208,6 @@ - - ./tools/deployment/osh-infra-monitoring/110-grafana.sh - ./tools/deployment/osh-infra-monitoring/120-nagios.sh - ./tools/deployment/osh-infra-monitoring/170-postgresql.sh - - - ./tools/deployment/osh-infra-monitoring/175-alerta.sh - ./tools/deployment/osh-infra-monitoring/600-grafana-selenium.sh || true - ./tools/deployment/osh-infra-monitoring/610-prometheus-selenium.sh || true - ./tools/deployment/osh-infra-monitoring/620-nagios-selenium.sh || true @@ -304,7 +302,6 @@ - ./tools/deployment/apparmor/095-nagios.sh - ./tools/deployment/apparmor/120-openvswitch.sh - ./tools/deployment/apparmor/170-postgresql.sh - - ./tools/deployment/apparmor/175-alerta.sh - job: name: openstack-helm-infra-aio-logging-apparmor