Skip to content

Commit 7e1370d

Browse files
committed
removed grafana data volume
1 parent 34a779b commit 7e1370d

File tree

4 files changed

+0
-50
lines changed

4 files changed

+0
-50
lines changed

ansible/roles/kube_prometheus_stack/defaults/main/helm.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ kube_prometheus_stack_release_defaults:
114114
plugins: "{{ grafana_plugins }}"
115115
nodeSelector:
116116
clusterrole: "server"
117-
persistence:
118-
type: pvc
119-
enabled: true
120-
existingClaim: grafana-pvc
121117
ldap:
122118
enabled: "{{ false if grafana_ldap == {} else true }}"
123119
config: "{{ grafana_ldap | to_yaml }}"

ansible/roles/kube_prometheus_stack/defaults/main/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ login_ip: "{{ hostvars[groups['openondemand'][0]]['ansible_host'] }}" # probably
1616
control_ip: "{{ ansible_default_ipv4.address| default(ansible_all_ipv4_addresses[0]) }}"
1717
control_sslip: "{{ control_ip | regex_replace('\\.', '-') }}.sslip.io"
1818

19-
grafana_volume_size: 10Gi
20-
2119
grafana_auth_anonymous: false
2220

2321
slack_integration:
@@ -72,8 +70,6 @@ prometheus_rules:
7270
# ------------------------------------------------------------------------------------------
7371
grafana_image_tag: 11.2.2
7472

75-
grafana_data_dir: "/var/lib/grafana"
76-
7773
grafana_security:
7874
admin_user: grafana
7975
admin_password: "{{ vault_grafana_admin_password }}"

ansible/roles/kube_prometheus_stack/tasks/main.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -53,42 +53,6 @@
5353
path: "{{ prometheus_db_dir }}"
5454
type: DirectoryOrCreate
5555

56-
- name: Create Grafana hostPath volume in /var/lib/state
57-
kubernetes.core.k8s:
58-
namespace: "{{ kube_prometheus_stack_release_namespace }}"
59-
definition:
60-
apiVersion: v1
61-
kind: PersistentVolume
62-
metadata:
63-
name: grafana-dir
64-
labels:
65-
app.kubernetes.io/name: grafana-dir
66-
spec:
67-
capacity:
68-
storage: "{{ grafana_volume_size }}"
69-
accessModes:
70-
- ReadWriteOnce
71-
hostPath:
72-
path: "{{ grafana_data_dir }}"
73-
type: DirectoryOrCreate
74-
75-
- name: Create PVC for Grafana
76-
kubernetes.core.k8s:
77-
namespace: "{{ kube_prometheus_stack_release_namespace }}"
78-
definition:
79-
apiVersion: v1
80-
kind: PersistentVolumeClaim
81-
metadata:
82-
name: grafana-pvc
83-
spec:
84-
accessModes:
85-
- ReadWriteOnce
86-
resources:
87-
requests:
88-
storage: "{{ grafana_volume_size }}"
89-
volumeMode: Filesystem
90-
volumeName: grafana-dir
91-
9256
# not looping through these because templating doesn't set ports as integer
9357
- name: Creating headless service for OOD exporter
9458
kubernetes.core.k8s:

environments/common/inventory/group_vars/all/grafana.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
grafana_image_tag: '11.2.2'
2-
grafana_port: 30001 # Must be within K3s' reserved port range (default 30000-32767)
3-
4-
# Define where state is stored
5-
grafana_data_dir: "{{ appliances_state_dir | default('/var/lib') }}/grafana"
6-
71
# Configure external address, with external URL depending on whether we are using Open Ondemand as a proxy
82
grafana_api_address: "{{ hostvars[groups['prometheus'].0].internal_address }}"
93
grafana_api_url: "http://{{ grafana_api_address }}:{{ grafana_port }}"

0 commit comments

Comments
 (0)