1
0
Fork 0
Commit Graph

82 Commits

Author SHA1 Message Date
Filip Pytloun 9e431b057e Unify Makefile, .gitignore and update readme 2017-02-02 13:02:03 +01:00
pasquier-s 4dab23a099 Merge pull request #24 from thouveng/add_grafana_dashboard
Add a Grafana dashboard
2017-01-17 11:45:47 +01:00
Guillaume Thouvenin a03625b147 Add a Grafana dashboard 2017-01-17 09:28:36 +01:00
thouveng cfc61d2139 Merge pull request #22 from thouveng/improve-docs
Make more explicit the configuration of binding parameters
2016-12-13 14:32:39 +01:00
thouveng 852764d54f Merge pull request #23 from thouveng/servers_attributes_configuration
Allow the configuration of servers attributes
2016-12-13 14:20:06 +01:00
Guillaume Thouvenin 8c79aa4e1a Allow the configuration of servers attributes 2016-12-13 13:57:50 +01:00
Guillaume Thouvenin 54a1b74bc2 Make more explicit the configuration of binding parameters 2016-12-13 11:20:42 +01:00
thouveng b388042cd6 Fix issue when new keys are available in datasource (#21)
Fix issue when new keys are available in datasource
2016-12-12 16:53:38 +01:00
thouveng ceb52864dc Merge pull request #19 from thouveng/provide-main-dashboard-oldway
Pass the main dashboard through grains
2016-12-09 10:40:57 +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
thouveng bc75e39659 Merge pull request #17 from thouveng/add-ldap-support
Add support for LDAP authentication
2016-12-09 09:45:38 +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
thouveng 884f1a179e Merge pull request #18 from thouveng/remove-old-dashboards
Remove old dashboards
2016-12-08 10:48:40 +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
thouveng 2d0cda0b06 Merge pull request #15 from thouveng/separate-configuration
Move the configuration into a separate state
2016-12-05 10:38:03 +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
Aleš Komárek cb170d8e90 Merge pull request #13 from tcpcloud/stacklight
Stacklight
2016-11-28 10:26:42 +01:00
thouveng cd5c7aff89 Merge pull request #12 from thouveng/add-client
Add client metadata
2016-11-18 13:29:05 +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
thouveng c4ddb9ebda Merge pull request #10 from thouveng/fix-grafana-templates
Replace pacemaker_local_resource_active in templating
2016-11-04 12:13:41 +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
thouveng 72e186cba8 Merge pull request #8 from thouveng/use-json-for-basic-auth
Use JSON format with basic auth
2016-11-03 17:39:00 +01:00
Guillaume Thouvenin e3e6e3f1d9 Use JSON format with basic auth 2016-11-03 15:27:29 +01:00
thouveng f3252e1850 Merge pull request #7 from thouveng/fix-grafana-parameters
Update grafana3_datasource parameters
2016-11-03 11:47:13 +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
pasquier-s ecf143a398 Merge pull request #6 from elemoine/stacklight-dashboards
Fix Grafana dashboards
2016-11-02 17:20:50 +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
thouveng b73ac79c42 Merge pull request #5 from thouveng/fix-grafana-state
Fix grafana state
2016-11-02 16:51:01 +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 5bbb9f23e0 Use POST instead of PUT when adding a new datasource 2016-11-02 15:48:12 +01:00
pasquier-s 667880a0c8 Merge pull request #4 from thouveng/fix-datasource
Fix datasource
2016-11-02 12:15:13 +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
Aleš Komárek a927d2162c Merge pull request #1 from tcpcloud/client
Client role
2016-10-28 11:50:09 +02:00
Aleš Komárek c8026444f0 Merge pull request #2 from thouveng/add-stacklight-dashboards
Add default dashboards for StackLight
2016-10-26 14:25:15 +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
Ales Komarek 7a593fad7a Mine fixes 2016-10-22 17:32:35 +02:00
Ales Komarek ae47c9fd95 Mine updates 2016-10-22 12:30:30 +02:00
Ales Komarek 9e05491147 Client role 2016-10-22 00:36:50 +02:00
Filip Pytloun 2e2279603e Setup for anonymous auth 2016-08-31 14:00:02 +02:00
Filip Pytloun e94fb0f68b Add metadata.yml 2016-04-14 14:56:42 +02:00
Filip Pytloun 120711d49f Add missing Makefile 2016-04-14 14:11:51 +02:00
Filip Pytloun 70aef872ba Add salt-master into build depends 2016-04-14 11:57:49 +02:00