From a502871b0cd9a3e816133bb792408a0e3f6c3284 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 28 Jun 2021 15:10:41 +0200
Subject: [PATCH] Rename prometheus-stack to kube-prometheus-stack
---
ansible/group_vars/all/settings.yml.example | 2 +-
...metheus-stack.yml => kube-prometheus-stack.yml} | 14 +++++++-------
ansible/roles/apps/tasks/main.yml | 2 +-
...theus-stack.yaml => kube-prometheus-stack.yaml} | 0
...stack_hr.yaml => kube-prometheus-stack_hr.yaml} | 0
5 files changed, 9 insertions(+), 9 deletions(-)
rename ansible/roles/apps/tasks/{prometheus-stack.yml => kube-prometheus-stack.yml} (86%)
rename ansible/roles/apps/templates/settings/{prometheus-stack.yaml => kube-prometheus-stack.yaml} (100%)
rename flux/oas/{prometheus-stack_hr.yaml => kube-prometheus-stack_hr.yaml} (100%)
diff --git a/ansible/group_vars/all/settings.yml.example b/ansible/group_vars/all/settings.yml.example
index c3995919c..862e90c0b 100644
--- a/ansible/group_vars/all/settings.yml.example
+++ b/ansible/group_vars/all/settings.yml.example
@@ -77,7 +77,7 @@ enabled_applications:
# - 'single-sign-on'
#
# Monitoring components (auto-enabled by GitLab CI)
- # - 'prometheus-stack'
+ # - 'kube-prometheus-stack'
# - 'loki'
# - 'promtail'
# - 'eventrouter'
diff --git a/ansible/roles/apps/tasks/prometheus-stack.yml b/ansible/roles/apps/tasks/kube-prometheus-stack.yml
similarity index 86%
rename from ansible/roles/apps/tasks/prometheus-stack.yml
rename to ansible/roles/apps/tasks/kube-prometheus-stack.yml
index 7941f3733..02c444309 100644
--- a/ansible/roles/apps/tasks/prometheus-stack.yml
+++ b/ansible/roles/apps/tasks/kube-prometheus-stack.yml
@@ -1,7 +1,7 @@
---
- name: Create prometheus auth secret for basic auth
tags:
- - prometheus-stack
+ - kube-prometheus-stack
- config
- secret
k8s:
@@ -17,7 +17,7 @@
- name: Create alertmanager auth secret for basic auth
tags:
- - prometheus-stack
+ - kube-prometheus-stack
- config
- secret
k8s:
@@ -36,10 +36,10 @@
- config
- flux
- monitoring
- - prometheus-stack
+ - kube-prometheus-stack
vars:
flux_secret:
- name: "prometheus-stack"
+ name: "kube-prometheus-stack"
namespace: "oas"
include_tasks:
file: flux_secret.yml
@@ -48,13 +48,13 @@
- config
- flux
- monitoring
- - prometheus-stack
+ - kube-prometheus-stack
- name: Create prometheus-related persistent volumes
tags:
- config
- monitoring
- - prometheus-stack
+ - kube-prometheus-stack
vars:
pvc:
name: "{{ item.name }}"
@@ -66,7 +66,7 @@
tags:
- config
- monitoring
- - prometheus-stack
+ - kube-prometheus-stack
loop:
- name: "alertmanager"
size: "2Gi"
diff --git a/ansible/roles/apps/tasks/main.yml b/ansible/roles/apps/tasks/main.yml
index 3d0b0eff9..9405d1079 100644
--- a/ansible/roles/apps/tasks/main.yml
+++ b/ansible/roles/apps/tasks/main.yml
@@ -10,7 +10,7 @@
import_tasks: letsencrypt.yml
- name: Tasks pertaining to prometheus and grafana
- import_tasks: prometheus-stack.yml
+ import_tasks: kube-prometheus-stack.yml
- name: Tasks pertaining to loki
import_tasks: loki.yml
diff --git a/ansible/roles/apps/templates/settings/prometheus-stack.yaml b/ansible/roles/apps/templates/settings/kube-prometheus-stack.yaml
similarity index 100%
rename from ansible/roles/apps/templates/settings/prometheus-stack.yaml
rename to ansible/roles/apps/templates/settings/kube-prometheus-stack.yaml
diff --git a/flux/oas/prometheus-stack_hr.yaml b/flux/oas/kube-prometheus-stack_hr.yaml
similarity index 100%
rename from flux/oas/prometheus-stack_hr.yaml
rename to flux/oas/kube-prometheus-stack_hr.yaml
--
GitLab