37 Commits

Author SHA1 Message Date
guochao
deadbdb43e Disable grafana Getting Started panel
I think that we do not need this in a production-ready project.

Change-Id: Ief1392c5e8becc90034fca782211a1da30da14ae
2017-08-16 09:57:49 +00:00
Jenkins
b4d7592adb Merge "Support customizing grafana home dashboard" 2017-08-16 03:52:34 +00:00
Mathias Ewald
f4e7b3af7f Add Elasticsearch to Grafana
This patch adds Elasticsearch to Grafana as a data source

Change-Id: I7c6452bba47274f9d971b8000e9d3e911617874d
2017-07-25 09:18:12 +00:00
Mathias Ewald
fa52fb3514 Fix grafana post-config check
Check grafana's /login url for status code 200 instead of root url since the
latter does not return an http 200 code

Change-Id: Ide7da26c0e217a4a60ad3d2ac693d6f7ac7bb722
Closes-Bug: #1705911
2017-07-24 11:13:22 +00:00
guochao
08753b404e Support customizing grafana home dashboard
Replace grafana home dashboard with file in node_custom_config folder.

Change-Id: I00e3963ee287c526935e34169b63b1a40e6b4025
2017-07-24 13:11:31 +08:00
Mathias Ewald
b7aef07d28 Fix grafana data source registration
Make data source creation more dynamic to support a variable number of data
source of different types

Only create data sources actually deployed by kolla

Change-Id: I26a2d3c71b178562b906623ab77eaff673c81dce
2017-07-21 09:35:55 +00:00
Jenkins
a71aa61ea7 Merge "Use unified vars in task" 2017-07-12 01:56:12 +00:00
caoyuan
36c530f9ed Fix the database user name for all roles
when create database user, it should use
database_user, not database_name.

Change-Id: I4dfa01d1a5a46c5c58f1fc47b0be71b186462764
Closes-Bug: #1698762
2017-06-20 21:19:31 +08:00
Jenkins
322eb353a2 Merge "Fix "Enable influxdb datasource" random error" 2017-06-16 11:22:46 +00:00
Bertrand Lallau
991695a272 Simplify condition check on standalone services
Condition check are already performed here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/site.yml
In order to simplify codebase, these checks can be removed for
standalone services.

Change-Id: Ib9842cd5363a1c7e56234a5e91dc264f89e2838f
2017-06-15 17:15:17 +02:00
Jeffrey Zhang
03e1b05f99 Use unified vars in task
Ansible task support vars directive, no need implement another one in
merge_config. This patch remove the vars directive in merge_config
action plugin.

Change-Id: I33648a2b6e39b4d49ce76eb66fbf2522721f8c68
2017-06-15 22:37:28 +08:00
Bertrand Lallau
49c083f555 Fix "Enable influxdb datasource" random error
Sometimes the "Enable influxdb datasource" task failed with "503 Service
Unavailable" error. Waiting for grafana port UP seems not always enough,
it requires to wait for application ready.

Change-Id: I3a27b3086698b89a80a3f585beb810831289ae7a
Closes-Bug: #1697213
2017-06-12 10:56:44 +00:00
Bertrand Lallau
bb1b0857b3 Grafana post_config checks only need to run locally
Recently added post_config for Grafana does some uri queries,
these can be problematic if run across every node.

Change-Id: I580212474879da18780fc5f66a21952a9e6f8daa
2017-06-02 21:30:51 +00:00
Bertrand Lallau
afdd11b9a2 Generalize api_interface_address variable usage
Useful api_interface_address variable has been define here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L57
In order to simplify codebase we must use it as much as possible.

Change-Id: I18fec19bf69e05a22a4142a9cd1165eccd022455
2017-05-23 08:35:15 +00:00
Jenkins
b077f6e7bb Merge "Add timeout parameter for precheck tasks" 2017-05-07 15:04:24 +00:00
Jeffrey Zhang
b1f015616c Add timeout parameter for precheck tasks
wait_for module waits 300 seconds for the port started or stopped.  This
is meaningless and useless in precheck. This patch change timeout to 1
seconds.

Change-Id: I9b251ec4ba17ce446655917e8ef5e152ef947298
Closes-Bug: #1688152
2017-05-04 09:02:25 +08:00
Jenkins
abd86ecd13 Merge "Fix Grafana config file template to use variables" 2017-05-03 13:33:26 +00:00
Bertrand Lallau
29844253c1 Grafana: automatically set InfuxDB datasource
In order to automate Grafana configuration, this fix automatically
set the InfluxDB datasource. This avoid doing a annoying manual
configuration after Kolla-ansible deployment.

Change-Id: I2b1a63fd371966192f1df0a82cee4711c6324710
2017-04-25 22:20:32 +02:00
Bertrand Lallau
a49e18a73f Fix Grafana config file template to use variables
Grafana session/provider_config property actually uses a static user
and a static database name.
If grafana_database_user and grafana_database_name default value is
changed, the config generated will not be updated accordingly.

Change-Id: I517daab5439ab1aef56a4b3a11104bd0717223bf
Closes-Bug: #1682810
2017-04-14 14:40:53 +02:00
Bertrand Lallau
dfdf3efb3f Fix error during Grafana container restart
grafana_ini file used in test condition doesn't exists,
use grafana_conf file instead.

Change-Id: Id5dca94aed98b0d6cf6c4f841e7380f8b8154416
Closes-Bug: #1673932
2017-03-21 09:28:18 +01:00
Paul Bourke
5418ada148 Enable sanity checks from kolla-ansible
Add a new subcommand 'check' to kolla-ansible, used to run the
smoke/sanity checks.

Add stub files to all services that don't currently have checks.

Change-Id: I9f661c5fc51fd5b9b266f23f6c524884613dee48
Partially-implements: blueprint sanity-check-container
2017-03-09 10:37:06 +00:00
Eduardo Gonzalez
7e53d2e74e Fix grafana database creation
Kolla use kolla_toolbox container to interact
with the database.
Grafana fails to deploy if mysql-python is not installed
in the host.

Change-Id: I033f1828ff027532de9be94aaf7dee6dbeab8fb6
Closes-Bug: #1661646
2017-02-03 23:32:04 +00:00
Mauricio Lima
43813b8a6d Optimize reconfiguration for grafana
Change-Id: I672d6fea935cbe7416ebd0cfff5006fddb9cd534
Partially-implements: blueprint better-reconfigure
2017-01-25 10:35:34 -03:00
Jenkins
3f8cb8adda Merge "Refactor bootstrap.yml file" 2017-01-18 10:17:50 +00:00
Jeffrey Zhang
7233b45d29 Refactor bootstrap.yml file
Change-Id: I00d2dcb0895548ba169ab85764cf546c2214cbf5
2017-01-12 23:37:50 +08:00
caoyuan
02d9de8636 Move grafana precheck into its own role
Change-Id: Ic2ad2b38d7e1c988f9dca9dc0d377cfee7b89504
Partially-implements: blueprint condition-pre-check
2017-01-11 16:25:07 +08:00
Jeffrey Zhang
fa45801946 Move precheck into its own role
* Merge prechecks.yml and site.yml playbook
* Create empty precheck.yml into all roles.

Change-Id: I8a138558a26c0a2a66c5fd48ed37be657c99c1dd
Implements: blueprint condition-pre-check
2016-11-03 14:48:58 +08:00
prameswar
c1d80d3410 grafana added to haproxy to listen on VIP
Closes-bug: #1636579

Change-Id: I5628196885bddebab84abb71c89753582123418c
2016-10-26 15:51:54 +00:00
Jeffrey Zhang
aed67d9cc5 Add missing closing brace in grafana configuration file
Change-Id: Iebcca62cccb02b71953c43e1b595b731fc9d0b92
Closes-Bug: #1634506
2016-10-18 21:36:09 +08:00
zhubingbing
ce3126c54a
Fix grafana upgrade permission issue
Change-Id: I15d96a8ee04f860ce149b8a64f306e181383d2fa
Partial-Bug: #1631503
2016-10-18 11:09:34 +08:00
Jenkins
45b0f2cf63 Merge "Remove do_reconfigure.yml file for all roles" 2016-10-13 16:20:30 +00:00
Jeffrey Zhang
0c15da00c8 Fix the wrong setting for Grafana session
The provider_config is configured wrong. And Grafana only supports one
Memcached instance for session, which is bad for high available.

Use mysql to provider the session storage.

TrivialFix

Change-Id: I889a961d7f36f44701654fbac04b4bff05043506
2016-10-10 19:47:32 +08:00
Jenkins
8bde923bba Merge "Add newline in grafana template" 2016-09-28 10:51:28 +00:00
Jeffrey Zhang
fa856556d5 Remove do_reconfigure.yml file for all roles
do_reconfigure.yml is introduced to use serial directive. But we use
it in wrong. Now serial has moved to playbook file. So it is time to
remove the do_reconfigure.yml file

Closes-Bug: #1628152
Change-Id: I8d42d27e6bc302a0e575b0353956eaef9b2ca9fd
2016-09-27 15:04:00 +00:00
zhubingbing
f9fcc192cf remove bootstrap.yml in grafana role upgrade.yml
beacause upgrade is not required to re create the database

TrivialFix

Change-Id: Ia0a776ecef61f80450edce093ac631b092532fc7
2016-09-27 07:04:17 +00:00
Eduardo Gonzalez
45ef86177f Add newline in grafana template
Grafana service fails while login
because a wrong memcached connection.

TrivialFix

Change-Id: I3b73733cd25bace09f1e478cbb770ba6a5ed85a5
2016-09-26 19:11:01 +02:00
Mathias Ewald
fe61591a7c Added grafana role
Added ansible role to deploy grafana

Added host group for grafana deployment

Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>

Change-Id: I3dec4e8586b6f65fa7de66a48506d1c79de2fe1e
Partially-Implements: Blueprint performance-monitoring
2016-09-14 09:36:34 +00:00