database setup
diff --git a/README.rst b/README.rst
index 2b25f33..626a529 100755
--- a/README.rst
+++ b/README.rst
@@ -8,42 +8,25 @@
Sample pillar
=============
- grafana:
- server:
- enabled: true
- source:
- type: 'git'
- address: https://github.com/torkelo/grafana.git
- rev: master
- elasticsearch:
- host: localhost
- port: 9200
- data:
- - name: metrics1
- type: graphite
- host: metrics1.domain.com
- ssl: true
- port: 443
- user: test
-
-Sample pillar with source from stable package
+Sample pillar with source from system package
grafana:
server:
enabled: true
source:
type: 'pkg'
- rev: 1.4.0
- elasticsearch:
+ version: 2.5.0
+ database:
+ engine: postgresql
host: localhost
- port: 9200
- data:
- - name: metrics1
- type: graphite
- host: metrics1.domain.com
- ssl: true
- port: 443
- user: test
+ port: 5432
+ data_source:
+ metrics1:
+ engine: graphite
+ host: metrics1.domain.com
+ ssl: true
+ port: 443
+ user: test
Read more
=========
diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index 93e847b..0f55457 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -54,11 +54,11 @@
#################################### Database ####################################
[database]
# Either "mysql", "postgres" or "sqlite3", it's your choice
-;type = sqlite3
-;host = 127.0.0.1:3306
-;name = grafana
-;user = root
-;password =
+type = {% if server.database.engine == "postgresql" %}postgres{% else %}{{ server.database.engine }}{% endif %}
+host = {{ server.database.host }}:{{ server.database.port }}
+name = {{ server.database.name }}
+user = {{ server.database.user }}
+password = {{ server.database.password }}
# For "postgres" only, either "disable", "require" or "verify-full"
;ssl_mode = disable
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index db2ade8..acf3d52 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,4 +3,10 @@
parameters:
grafana:
server:
- enabled: true
\ No newline at end of file
+ enabled: true
+ database:
+ engine: postgresql
+ host: 127.0.0.1
+ name: grafana
+ password: ${_param:postgresql_grafana_password}
+ user: grafana
\ No newline at end of file