Merge "Revert Grafana Volume config"
diff --git a/docker/swarm/stack/dashboard.yml b/docker/swarm/stack/dashboard.yml
index d3f0391..2ee123b 100644
--- a/docker/swarm/stack/dashboard.yml
+++ b/docker/swarm/stack/dashboard.yml
@@ -5,8 +5,6 @@
grafana_database_host: localhost
grafana_database_port: 3306
grafana_database_password: password
- grafana_data_directory: /var/lib/grafana
- grafana_session_life_time: 86400
docker:
client:
stack:
@@ -20,16 +18,10 @@
image: ${_param:docker_image_grafana}
ports:
- 15013:3000
- volumes:
- - /srv/volumes/grafana:${_param:grafana_data_directory}
environment:
GF_DATABASE_TYPE: ${_param:grafana_database_type}
GF_DATABASE_NAME: grafana
GF_DATABASE_USER: grafana
GF_DATABASE_PASSWORD: ${_param:grafana_database_password}
GF_DATABASE_HOST: "${_param:grafana_database_host}:${_param:grafana_database_port}"
- GF_PATHS_DATA: ${_param:grafana_data_directory}
GF_SECURITY_ADMIN_PASSWORD: ${_param:grafana_admin_password}
- GF_SESSION_PROVIDER: file
- GF_SESSION_PROVIDER_CONFIG: ${_param:grafana_data_directory}/data/sessions
- GF_SESSION_LIFE_TIME: ${_param:grafana_session_life_time}
\ No newline at end of file
diff --git a/glusterfs/client/volume/grafana.yml b/glusterfs/client/volume/grafana.yml
deleted file mode 100644
index bd939c1..0000000
--- a/glusterfs/client/volume/grafana.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
- _param:
- grafana_glusterfs_service_host: ${_param:glusterfs_service_host}
- glusterfs_node01_address: ${_param:cluster_node01_address}
- glusterfs_node02_address: ${_param:cluster_node02_address}
- glusterfs_node03_address: ${_param:cluster_node03_address}
- glusterfs:
- client:
- volumes:
- grafana:
- path: /srv/volumes/grafana
- server: ${_param:grafana_glusterfs_service_host}
- opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/glusterfs/server/volume/grafana.yml b/glusterfs/server/volume/grafana.yml
deleted file mode 100644
index f099c99..0000000
--- a/glusterfs/server/volume/grafana.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- glusterfs:
- server:
- volumes:
- grafana:
- storage: /srv/glusterfs/grafana
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/grafana
- - ${_param:cluster_node02_address}:/srv/glusterfs/grafana
- - ${_param:cluster_node03_address}:/srv/glusterfs/grafana
- options:
- cluster.readdir-optimize: On
- nfs.disable: On
- network.remote-dio: On
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING