1
0
Fork 0
mirror of synced 2024-11-05 01:08:57 -05:00
Commit graph

69 commits

Author SHA1 Message Date
Dmitry Kalashnik
f26ff0fce5 Add all grafana dashboards into grafana formula
Change-Id: Iced67bc96c579883607bd446342132c0873148d7
PROD-Related: PROD-22139
2018-09-04 17:37:51 +04:00
Oleksii Grudev
c9af93ce61 Grafana prevent yaml from failing
When including /meta/salt.yml from outside of this
formula the yaml can fail if appropriate pillar elements are not
found. Changing syntax to eliminate this. Including the file
above is needed for generating minion orchestration config
for future use with salt orchestration methods

Change-Id: Ia3fb7eee7c6298d294f641232c8c7e8f8b5806af
Related-PROD: PROD-19973
2018-07-19 12:42:12 +03:00
Michal Kobus
a0c95206e5 Dashboard rationalization
Change-Id: Ibc51a3c0839968678e930fbc7b88218988fc0dc2
Closes-bug: PROD-20091
2018-06-21 15:40:35 +02:00
Michal Kobus
758a110fa5 Dashboard rationalization
Change-Id: Id1f7d2719080456bc7ceb168cb32ee6cd4d4a800
Closes-bug: PROD-20082
2018-06-20 14:14:27 +02:00
Ildar Svetlov
2d26b366a1 Rework grafana.client state
- add 'parameters' section loaded from grains to pass parameters
into dashboard template
- pass context into json dashboard template

Change-Id: I5848c315abe6951b5572b4c63db2d847395ae725
Related-PROD: PROD-18535
2018-06-01 15:46:26 +04:00
Ildar Svetlov
52720eb1e5 Change Grafana dashboards since new metrics available
removed IO panel, because there are no io metrics anymore and
this panel is useless;
added general grafana panel with 4 new graphs:
count of organizations,
count of users,
count of playlists,
count of dashboards.

Related-Bug: PROD-18204
Change-Id: I92034621746803ea5e744c1a055d08dd32e71a90
2018-03-06 17:04:59 +04:00
Ildar Svetlov
627cbfddbb Enable Prometheus scraping metrics from Grafana metrics endpoint
Change-Id: Iefa86330cc9f23f7453a79979a8c34adab36a411
Related-Bug: PROD-18204
2018-03-06 15:52:15 +04:00
Martin Polreich
1e62599ad1 Add prometheus main dashboard config
Change-Id: I594ce5914403d2fb7655b69262dfca61bef7cadf
2017-10-18 11:20:10 +00:00
abednarik
2878e14395 Include PID_FILE_DIR config 2017-09-14 11:58:22 -03:00
abednarik
cce0a4c3b7 Add pid_file config to defaults file 2017-09-14 11:29:35 -03:00
abednarik
6566e96e22 Ensure custom paths are created and have correct permissions. 2017-08-07 14:30:22 -03:00
abednarik
69e22ffac2 Make grafana paths configurable. 2017-08-04 12:36:22 -03:00
Martin Polreich
f91843bc99 Add Grafana dashboard for Prometheus
Change-Id: I6ca11df4fc10b24c9c28dbc77188d73eaace2071
2017-07-26 11:38:13 +00:00
Simon Pasquier
f6e5544264 Manage dashboards only for the current datasource
This change adds a new 'datasource' parameter to the dashboard metadata.
This way, the Grafana client state will manage only the dashboards that
match with the deployed datasource (either InfluxDB or Prometheus). For
backward compatibility, the client will always manage the dashboards
that don't set this new parameter.

Change-Id: Iac323d756aff6ca4180f4b648a1d02692ebf292b
2017-05-24 10:33:54 +02:00
Tomáš Kukrál
2127f4e493 fix meta/salt with missing pillar
Change-Id: I714a6ecfe3d4e3014d31bf4009dd3e6fc46bc86e
2017-05-11 20:17:38 +00:00
Ondrej Smola
d77f5c70e2 Put collector back to init 2017-05-11 17:10:02 +02:00
Filip Pytloun
3a82ac8bf0 Fix grain structure
Change-Id: Icef4e4aaaadffbd9db81c32108e13d58051106f4
2017-05-11 11:31:11 +02:00
Filip Pytloun
67a022be4f Manage minion.d using support metadata
Change-Id: I37f1c26f8125d98bcbe8d5a105dd5abac9224b36
2017-05-03 15:29:12 +02:00
Swann Croiset
4931237ebc Fixes
Change-Id: I2992d1543bd09542239eefd9fd23434f1f374df2
2017-05-03 15:21:43 +02:00
Ales Komarek
a89a9c1065 Merge "Allow to override the datasource name" 2017-05-03 07:59:33 +00:00
Filip Pytloun
44657188cf Manage grains using support metadata
Change-Id: I8ab61330338213b474ec372e911667f7255eafbd
2017-05-02 14:51:01 +02:00
Swann Croiset
9356e26822 Allow to override the datasource name
Change-Id: Ieeeace081771b4840959cceb66b9dea248030482
2017-05-02 14:00:09 +02:00
Ales Komarek
32bf75e7c8 Merge "Add a dashboard to show the uptime of services" 2017-03-24 13:33:43 +00:00
Swann Croiset
dd65097f2b Fix the plugin installation
Change-Id: If4c1893ab7068687f597fa406d4a568af143520b
2017-03-21 11:37:56 +01:00
Guillaume Thouvenin
f014d23f2d Add a dashboard to show the uptime of services
Change-Id: If7f4cca229b9ebb6fc1a247cc51092126284f80c
2017-03-20 09:28:20 +00:00
Guillaume Thouvenin
22c462b504 Allow the installation of Grafana plugins
Change-Id: I6eab0435fb169ed12c880af01ba1e76a06268825
2017-03-15 10:14:52 +01:00
Olivier Bourdon
308f9e4f0e Fix dashboard for matching environment name
Change-Id: I05ad28a3b10e5ba665f61f495beec3077a0f83eb
2017-02-28 13:13:35 +01:00
Guillaume Thouvenin
75f38cb940 Add local check for Grafana in Sensu
Change-Id: I4284ab5c06cf441be554f58ca95f3c507d2f5f60
2017-02-21 17:03:35 +01:00
Guillaume Thouvenin
885c5fc79c Provides a base panel to construct the main dashboard
This patch adds a default panel that will be used when another service
will add a new panel into the main dashboard through grains. This is the
common part between all panels of the main dashboard.

It replaces the static main dashboard that has been removed.
2017-01-26 13:26:29 +01:00
Guillaume Thouvenin
a03625b147 Add a Grafana dashboard 2017-01-17 09:28:36 +01:00
Guillaume Thouvenin
8c79aa4e1a Allow the configuration of servers attributes 2016-12-13 13:57:50 +01:00
Guillaume Thouvenin
a8902b8c23 Pass the main dashboard through grains
This patch provides the main dashboard through grains. It is not the final
way to provide the main dashboard. It is more a workaround because we
don't know yet how to compose a dashboards with pieces split between
several formulas. We will probably use YAML pieces.
2016-12-09 10:27:54 +01:00
Guillaume Thouvenin
377c14cca0 Add support for LDAP authentication
This patch adds support for LDAP authentication. It also adds support
to manage authorization. It is now possible to enable several kind of
authentication like LDAP and basic auth. So we introduce a new schema
for allowing it:

  auth:
    basic:
      enabled: true
    ldap:
      enabled: true
      [...]

instead of

  auth:
    engine: basic

The former declaration is still valid for basic, anonymous and proxy
authentication.
2016-12-08 17:15:56 +01:00
Guillaume Thouvenin
92359ec273 Remove old dashboards
This patch removes dashboards that are now provided by each services.
They are not up to date so just remove them.
2016-12-07 12:30:28 +01:00
Guillaume Thouvenin
57167d8bfd Move the configuration into a separate state
This patch separates the configuration of Grafana client. This allows to
configure the client, restart the minion to read the conf and finally
apply the grafana.client state.
2016-12-05 09:47:46 +01:00
pasquier-s
7e07c93f36 Merge pull request #14 from thouveng/use-get-with-enabled
Use get function to check if a "role" is enabled
2016-11-28 15:02:18 +01:00
Guillaume Thouvenin
6306087672 Use get function to check if a role is enabled
This patch uses the function get with False by default. This is to allow
to call a state even if the node is not classified.
2016-11-28 12:04:11 +01:00
Guillaume Thouvenin
18fe0c04c7 Add client metadata 2016-11-18 08:57:08 +01:00
thouveng
13574258bc Merge pull request #11 from thouveng/use-json-dashboards
Add support for JSON dashboards
2016-11-15 09:27:28 +01:00
Guillaume Thouvenin
2958bda057 Add support for JSON dashboards
This patch adds the support for JSON dashboards and also provides the
support for remote dashboards.
2016-11-10 14:49:22 +01:00
pasquier-s
de5d730e12 Merge pull request #9 from simonpasquier/add-collectd-support
Add collectd support
2016-11-09 10:53:56 +01:00
Simon Pasquier
777902ad8f Add collectd support 2016-11-04 12:06:32 +01:00
Guillaume Thouvenin
cf02140010 Replace pacemaker_local_resource_active in dashboards templating 2016-11-04 12:03:55 +01:00
Guillaume Thouvenin
ab1023453d Update grafana3_datasource parameters
This patch removes parameters that are not used and not documented.
It also fix issue when passing parameters to _get_json_data.
2016-11-03 10:47:37 +01:00
Éric Lemoine
398d7ac77d Fix Grafana dashboards
This commit fixes the InfluxDB queries used in Grafana dashboards. A regexp
should be used with variables.
2016-11-02 17:09:41 +01:00
Guillaume Thouvenin
eed48db172 Use the right parameters to configure datasource
This patch uses the user and password instead of setting basic auth that
is used as credentials when connecting to the Grafana server. In our
case we are using the grafana configuration on the minion to connect to
Grafana. This patch also adds an option to set the datasource as the
default one.
2016-11-02 16:33:09 +01:00
Guillaume Thouvenin
22a78bd9b5 Allow basic auth when datasource is adding
This patch fixes an issue to use basic auth when the datasource is
adding for the first time. It also adds a delay when service is started.
2016-11-02 10:06:18 +01:00
Ales Komarek
3f044b20d6 Grafana theming, dashboards, datasources management with basic auth 2016-10-30 00:31:00 +02:00
Guillaume Thouvenin
70ca667e57 Add default dashboards for StackLight
This patch adds the possibility to add StackLight dashboards when
installing grafana. By default they are not installed.
2016-10-26 11:25:37 +02:00
Ales Komarek
d125d51baa Fixed commented problems 2016-10-24 11:00:40 +02:00