Mine fixes
This commit is contained in:
parent
ae47c9fd95
commit
7a593fad7a
2 changed files with 30 additions and 31 deletions
52
README.rst
52
README.rst
|
@ -5,9 +5,11 @@ Grafana
|
||||||
|
|
||||||
A beautiful, easy to use and feature rich Graphite dashboard replacement and graph editor.
|
A beautiful, easy to use and feature rich Graphite dashboard replacement and graph editor.
|
||||||
|
|
||||||
|
|
||||||
Sample pillars
|
Sample pillars
|
||||||
==============
|
==============
|
||||||
|
|
||||||
|
|
||||||
Server deployments
|
Server deployments
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
@ -42,10 +44,11 @@ Server installed with PostgreSQL database
|
||||||
user: grafana
|
user: grafana
|
||||||
password: passwd
|
password: passwd
|
||||||
|
|
||||||
|
|
||||||
Collector setup
|
Collector setup
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
Used to aggregate dashboards
|
Used to aggregate dashboards from monitoring node.
|
||||||
|
|
||||||
.. code-block:: yaml
|
.. code-block:: yaml
|
||||||
|
|
||||||
|
@ -83,7 +86,7 @@ Client enforced data sources
|
||||||
password: password
|
password: password
|
||||||
index: grafana-dash
|
index: grafana-dash
|
||||||
|
|
||||||
Client enforced dashboards
|
Client defined and enforced dashboard
|
||||||
|
|
||||||
.. code-block:: yaml
|
.. code-block:: yaml
|
||||||
|
|
||||||
|
@ -117,12 +120,13 @@ Client enforced dashboards defined in salt-mine
|
||||||
port: 3000
|
port: 3000
|
||||||
token: token
|
token: token
|
||||||
|
|
||||||
|
|
||||||
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. Lists are replaced by dictionaries to support mergings and interpolations.
|
||||||
|
|
||||||
Client enforced dashboards defined in salt-mine
|
The default format of Grafana dashboards with lists for rows, panels and targets.
|
||||||
|
|
||||||
.. code-block:: yaml
|
.. code-block:: yaml
|
||||||
|
|
||||||
|
@ -146,28 +150,32 @@ Client enforced dashboards defined in salt-mine
|
||||||
showTitle: true
|
showTitle: true
|
||||||
|
|
||||||
|
|
||||||
|
The modified version of Grafana dashboard format that supports character interpolation.
|
||||||
|
|
||||||
.. code-block:: yaml
|
.. code-block:: yaml
|
||||||
|
|
||||||
system_metrics:
|
system_metrics:
|
||||||
title: graph
|
system_metrics2:
|
||||||
editable: true
|
title: graph
|
||||||
hideControls: false
|
editable: true
|
||||||
rows:
|
hideControls: false
|
||||||
- title: Usage
|
row:
|
||||||
height: 250px
|
usage:
|
||||||
panels:
|
title: Usage
|
||||||
- title: Panel Title
|
height: 250px
|
||||||
span: 6
|
panel:
|
||||||
editable: false
|
usage-panel:
|
||||||
type: graph
|
title: Panel Title
|
||||||
targets:
|
span: 6
|
||||||
- refId: A
|
editable: false
|
||||||
target: "support_prd.cfg01_iot_tcpcloud_eu.cpu.0.idle"
|
type: graph
|
||||||
datasource: graphite01
|
target:
|
||||||
renderer: flot
|
A:
|
||||||
showTitle: true
|
refId: A
|
||||||
|
target: "support_prd.cfg01_iot_tcpcloud_eu.cpu.0.idle"
|
||||||
|
datasource: graphite01
|
||||||
|
renderer: flot
|
||||||
|
showTitle: true
|
||||||
|
|
||||||
|
|
||||||
Read more
|
Read more
|
||||||
|
|
|
@ -26,15 +26,6 @@ grafana_client_datasource_{{ datasource_name }}:
|
||||||
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
{%- for dashboard_name, dashboard in client.dashboard.iteritems() %}
|
|
||||||
|
|
||||||
grafana_client_dashboard_{{ dashboard_name }}:
|
|
||||||
grafana_dashboard.present:
|
|
||||||
- name: {{ dashboard_name }}
|
|
||||||
- dashboard: {{ dashboard }}
|
|
||||||
|
|
||||||
{%- endfor %}
|
|
||||||
|
|
||||||
{%- set raw_dict = {} %}
|
{%- set raw_dict = {} %}
|
||||||
{%- set final_dict = {} %}
|
{%- set final_dict = {} %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue