diff --git a/bitbucket-ssh-argocd-key b/bitbucket-ssh-argocd-key deleted file mode 100644 index 299bf85..0000000 --- a/bitbucket-ssh-argocd-key +++ /dev/null @@ -1,38 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/bitbucket-ssh-argocd-key.pub b/bitbucket-ssh-argocd-key.pub deleted file mode 100644 index 5171052..0000000 --- a/bitbucket-ssh-argocd-key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD5xWOBepDmo//7Yne66cpTrzX5zViiGMFYtejKCXP4Yj0w0OhZzPWzS/wZfUCAxTh9OQdy5AK8Yu86I6A0VhYoYqFe++nw+VdrqqAMg5brZCDULpXF3BQy7dDMeVVH93EJSu2Vgv3aWPpRFfNK0JKm+IEqerMYwmK2XDIjYK2sRkhGViTMb1AvKkVD412Mjd1DfzjyDqA7CQieKP4tHfHoy+Q45l5fJz6OzhhHvBaTM6L8oesln7PC4mpMPZ3/C8NHcSLJ96AMOKLLLb2vJdbLYsJvn4WZfHMP+I70uKjQQ/z7h+KDDr2MfYtk/8Aif27uc6zu7pldDnpOKOAXtSlTCuDtWx86bV+MLfeB14zACQ4sDyg5NWVphbdludZgZnoEdFXzKGiFoHtc3cdzmMNbrLh+ubD5WTw6bRuLpIpM+qfzXY18gZKTEVn2dDlnjQ+0WH+pf0wlDIjrILBEYW1oBEb/yaK2egIKUvjuRpgd6kzLi1KB8rNMWvnvm1Eokyc= vbarba@MacBook-Pro-2.local diff --git a/k8s/monitoring/manifests/alertmanager-slack-config.yaml b/k8s/alertmanager-slack/alertmanager-slack-config.yaml similarity index 88% rename from k8s/monitoring/manifests/alertmanager-slack-config.yaml rename to k8s/alertmanager-slack/alertmanager-slack-config.yaml index 0d5d2fc..3c4fbc0 100644 --- a/k8s/monitoring/manifests/alertmanager-slack-config.yaml +++ b/k8s/alertmanager-slack/alertmanager-slack-config.yaml @@ -30,8 +30,7 @@ spec: channel: '#monitoring-alerts' iconURL: 'https://avatars3.githubusercontent.com/u/3380462' sendResolved: true - title: >- - [{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] Monitoring Event Notification + title: '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] Monitoring Event Notification' text: >- {{ range .Alerts }} *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}` diff --git a/k8s/alertmanager-slack/kustomization.yaml b/k8s/alertmanager-slack/kustomization.yaml new file mode 100644 index 0000000..7f29327 --- /dev/null +++ b/k8s/alertmanager-slack/kustomization.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: monitoring + +resources: + - alertmanager-slack-config.yaml \ No newline at end of file diff --git a/k8s/applications/alertmanager-slack.yaml b/k8s/applications/alertmanager-slack.yaml new file mode 100644 index 0000000..6d41e40 --- /dev/null +++ b/k8s/applications/alertmanager-slack.yaml @@ -0,0 +1,24 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: alertmanager-slack +spec: + destination: + name: '' + namespace: alertmanager-slack + server: 'https://kubernetes.default.svc' + source: + path: k8s/alertmanager-slack + repoURL: 'git@bitbucket.org:jamkazam/video-iac.git' + targetRevision: HEAD + project: default + syncPolicy: + automated: + prune: true + allowEmpty: false + retry: + limit: 5 + backoff: + duration: 5s + factor: 2 + maxDuration: 3m \ No newline at end of file diff --git a/k8s/applications/kustomization.yaml b/k8s/applications/kustomization.yaml index 2acb21f..ebcb59e 100644 --- a/k8s/applications/kustomization.yaml +++ b/k8s/applications/kustomization.yaml @@ -11,4 +11,5 @@ resources: - metrics-server.yaml - external-dns.yaml - ingress-nginx.yaml - - monitoring.yaml \ No newline at end of file + - monitoring.yaml + - alertmanager-slack.yaml \ No newline at end of file diff --git a/k8s/monitoring/Chart.yaml b/k8s/monitoring/Chart.yaml index 95b8d1c..90d5c1c 100644 --- a/k8s/monitoring/Chart.yaml +++ b/k8s/monitoring/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: monitoring -version: 1.0 +version: '1.0' dependencies: - name: kube-prometheus-stack version: "19.2.2" diff --git a/k8s/monitoring/templates/prometheus-rules.yaml b/k8s/monitoring/templates/prometheus-rules.yaml deleted file mode 100644 index 42350c7..0000000 --- a/k8s/monitoring/templates/prometheus-rules.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - creationTimestamp: null - labels: - prometheus: example - role: alert-rules - name: prometheus-example-rules -spec: - groups: - - name: ./example.rules - rules: - - alert: ExampleAlert - expr: vector(1) \ No newline at end of file diff --git a/k8s/stg-video-cluster-kubeconfig.yaml b/k8s/stg-video-cluster-kubeconfig.yaml deleted file mode 100644 index 1121a49..0000000 --- a/k8s/stg-video-cluster-kubeconfig.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Config -preferences: {} - -clusters: -- cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeE1UQXlOekUyTlRnd01Wb1hEVE14TVRBeU5URTJOVGd3TVZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTVpmCjFKbEg3Q3hrR1J0emlsVXJBSEc5R0p4WVFKaWJlSlRpM3I2Vkg2cFpBL1k0SXZJTjZpTjJKcTl1UmtPV2I0Z3UKcW00dG4rSTdicDRhTU43UTBoYnBUVUoyQnFmRjdMd2IvOTJMS2QzK0EvUVJ3eEs1ZUxtY1k0WERaQmdhOUxlTAo1V2VoUCtaOG5nWkpTWGRGTHgrclVoY2xLbUovZ0VqL0VFQ0hhWlI3YWhsU3FUcGFJbDZEVjdtc09veGMvYUNvClV2d3lIZmw5Rjgva21LU0cxVGJVM0N0ME9LWGpTZEl5NjQrRTJQK05BZElYYmU4SWJQYmJFcG8xdzBCcFB4QXcKa3E3QnF4dC9oM0puaUpBRG1LVmlreDBXY3A0ZTh0RkpHV3VCenFEdVpOdnlnQ0o5VFhLTktYQ2pEUkIxZ0lOdwpiUjF4bjF4NlNUaDZUS0lUaHhNQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZDcFlVWHRlUVdONjJnMjNhNGphNXNqSkwyRmJNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBSUtuWnI0N0lSUllxUVE3cWpyeFNHWERHK2VLUmVaSVlmWWc0YmthRXlYRC92NGFGbAp2bHg5cmxWYU1FQmRNN1JNY1FlNUNYYnFhQ0RISVlEeHFEOGVDR2dDSUVPUUcrK0VjYmIwWjkwK1lBOUZVZklNCmtNanhnV2hRaEhIeWltZHlpdzJncGs2MDJoWUxaZ1grMENySEpzNk8zSHBpSUFjUGhZc0JnclpoRUxCV1l6aHgKV21SckRldG9ZazhOMktJRmphMzYvWjhvcUZKK3Bxa09yZ0dxYm80SGhWNDVNMmZCckZJcGNQMi9wUEpjMDJERwpNWnNkL3ozWmFZSXR2MDBPMG5GNDVpYk5wTHBBMjZBZFRPS2RsUXZTY0haQ0h3WUlQNytHUmI3am5lQSt1Z2hjClQ3UFNHSVhmd2tRd04razBDdkpmYk9yaVhLSUtXWnZ3bHE1aAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - server: https://c2c3b4c8-3f99-4b1c-b611-2f938ec8bb8c.cpc1-us-central.linodelke.net:443 - name: lke41285 - -users: -- name: lke41285-admin - user: - as-user-extra: {} - token: eyJhbGciOiJSUzI1NiIsImtpZCI6InVPOEdJV1FnZkVJWU1DQVNCRFJPOVVkVV93ZEhUZEE2LWJOZWlNenlhWHcifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJsa2UtYWRtaW4tdG9rZW4tMmptOGwiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC5uYW1lIjoibGtlLWFkbWluIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQudWlkIjoiMzlmOTFmOWQtZjQ1My00YzZlLWFlY2QtZTI3ZWQ0Mjg5ZDk0Iiwic3ViIjoic3lzdGVtOnNlcnZpY2VhY2NvdW50Omt1YmUtc3lzdGVtOmxrZS1hZG1pbiJ9.JnUUn57SgkH5ljg2npSyaSCxr9VyKtH3hdfsgOlaqHcKjiRKetXXE57ipTBIkrE7U7me0ClHjR2UeZX09gcRRILdfElABdVRhi8z-KvGj9DKwLPfbdWHEYniT0xfTe0w-Li1d2BZpyePjPFWudoEKvlmWojBaNTOsdfGfuah-ZUMnmFORuELz3ie2D2U0X-vTR8UuqsPt1A9PJ0fKbDRyiYK5wmzRMaHg0k9IoLdZB4tgxaEvcv0Oj8xIbT4R8qy4lTPxs3R9A_ZvmTbZdY_AKj4GTcqYDrQefntAOgOEnkKQzq50_rzaSop28kXVR5Vx5_2jGi3CkjdWjedV-r_xg - -contexts: -- context: - cluster: lke41285 - namespace: default - user: lke41285-admin - name: lke41285-ctx - -current-context: lke41285-ctx -