database setup

README.rst

@@ -8,42 +8,25 @@ A beautiful, easy to use and feature rich Graphite dashboard replacement and gra
 Sample pillar
 =============
 
-    grafana:
+Sample pillar with source from system package
-      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
 
     grafana:
       server:
         enabled: true
         source:
           type: 'pkg'
-          rev: 1.4.0
+          version: 2.5.0
-        elasticsearch:
+        database:
+          engine: postgresql
           host: localhost
-          port: 9200
+          port: 5432
-        data:
+        data_source:
-        - name: metrics1
+          metrics1:
-          type: graphite
+            engine: graphite
-          host: metrics1.domain.com
+            host: metrics1.domain.com
-          ssl: true
+            ssl: true
-          port: 443
+            port: 443
-          user: test
+            user: test
 
 Read more
 =========

grafana/files/grafana.ini

@@ -54,11 +54,11 @@ http_port = {{ server.bind.port }}
 #################################### Database ####################################
 [database]
 # Either "mysql", "postgres" or "sqlite3", it's your choice
-;type = sqlite3
+type = {% if server.database.engine == "postgresql" %}postgres{% else %}{{ server.database.engine }}{% endif %}
-;host = 127.0.0.1:3306
+host = {{ server.database.host }}:{{ server.database.port }}
-;name = grafana
+name = {{ server.database.name }}
-;user = root
+user = {{ server.database.user }}
-;password =
+password = {{ server.database.password }}
 
 # For "postgres" only, either "disable", "require" or "verify-full"
 ;ssl_mode = disable

metadata/service/server/single.yml

@@ -4,3 +4,9 @@ parameters:
   grafana:
     server:
       enabled: true
+      database:
+        engine: postgresql
+        host: 127.0.0.1
+        name: grafana
+        password: ${_param:postgresql_grafana_password}
+        user: grafana