Linux-Help/formula-grafana
1
0
Fork 0
mirror of synced 2024-11-22 08:55:35 -05:00
Code Issues Releases Wiki Activity

Fixed commented problems

Browse source
This commit is contained in:
Ales Komarek 2016-10-24 11:00:40 +02:00
parent 7a593fad7a
commit d125d51baa
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.rst
View file

@ -82,8 +82,6 @@ Client enforced data sources
type: elasticsearch type: elasticsearch
host: log01.domain.com host: log01.domain.com
port: 80 port: 80
user: admin
password: password
index: grafana-dash index: grafana-dash
Client defined and enforced dashboard Client defined and enforced dashboard
@ -124,7 +122,10 @@ Client enforced dashboards defined in salt-mine
Usage Usage
===== =====
There's a difference between JSON dashboard representation and models we us. Lists are replaced by dictionaries to support mergings and interpolations. There's a difference between JSON dashboard representation and models we us.
The lists used in JSON format [for rows, panels and target] were replaced by
dictionaries. This form of serialization allows better merging and overrides
of hierarchical data structures that dashboard models are.
The default format of Grafana dashboards with lists for rows, panels and targets. The default format of Grafana dashboards with lists for rows, panels and targets.
@ -149,8 +150,9 @@ The default format of Grafana dashboards with lists for rows, panels and targets
renderer: flot renderer: flot
showTitle: true showTitle: true
The modified version of Grafana dashboard format with dictionary declarations.
The modified version of Grafana dashboard format that supports character interpolation. Please note that dictionary keys are only for logical separation and are not
displayed in generated dashboards.
.. code-block:: yaml .. code-block:: yaml

2
grafana/files/grafana.ini
View file

@ -66,7 +66,7 @@ password = {{ server.database.password }}
;ssl_mode = disable ;ssl_mode = disable
# For "sqlite3" only, path relative to data_path setting # For "sqlite3" only, path relative to data_path setting
{%- if server.database.engine in ["postgresql"] %} {%- if server.database.engine in ["sqlite"] %}
path = grafana.db path = grafana.db
{%- endif %} {%- endif %}