opendev/system-config
Code Issues Proposed changes

Merge "Add grafyaml support"

Browse Source
This commit is contained in:
Jenkins 2015-10-19 18:20:20 +00:00 committed by Gerrit Code Review
commit a7feaf0cdc
5 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
doc/source/grafyaml.rst Normal file
View File

@ -0,0 +1,25 @@
:title: Grafyaml
.. _grafyaml:
Grafyaml
########
Grafyaml is a system for configuring Grafana dashboards using
simple YAML files stored in Git.
At a Glance
===========
:Hosts:
* http://grafana.openstack.org
:Puppet:
* https://github.com/pabelanger/puppet-grafyaml
:Configuration:
* :config:`grafana`
:Projects:
* https://git.openstack.org/cgit/openstack-infra/grafyaml
:Bugs:
* https://storyboard.openstack.org/#!/project/818
:Resources:
* `Reference Manual <http://docs.openstack.org/infra/grafyaml>`_

1
doc/source/systems.rst
View File

@ -9,6 +9,7 @@ Major Systems
cacti
gerrit
grafana
grafyaml
jenkins
zuul
jjb

15
manifests/site.pp
View File

@ -123,13 +123,14 @@ node 'grafana.openstack.org' {
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::grafana':
admin_password => hiera('grafana_admin_password', 'XXX'),
admin_user => hiera('grafana_admin_user', 'username'),
mysql_host => hiera('grafana_mysql_host', 'localhost'),
mysql_name => hiera('grafana_mysql_name', 'XXX'),
mysql_password => hiera('grafana_mysql_password', 'XXX'),
mysql_user => hiera('grafana_mysql_user', 'username'),
secret_key => hiera('grafana_secret_key', 'XXX'),
admin_password => hiera('grafana_admin_password', 'XXX'),
admin_user => hiera('grafana_admin_user', 'username'),
mysql_host => hiera('grafana_mysql_host', 'localhost'),
mysql_name => hiera('grafana_mysql_name', 'XXX'),
mysql_password => hiera('grafana_mysql_password', 'XXX'),
mysql_user => hiera('grafana_mysql_user', 'username'),
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
secret_key => hiera('grafana_secret_key', 'XXX'),
}
}

1
modules.env
View File

@ -85,6 +85,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-exim"]="origin/m
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-gerrit"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-gerritbot"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-github"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-grafyaml"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-graphite"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-haveged"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-httpd"]="origin/master"

17
modules/openstack_project/manifests/grafana.pp
View File

@ -10,9 +10,12 @@ class openstack_project::grafana (
$admin_password = '',
$admin_user = 'admin',
$grafana_cfg = {},
$http_host = '127.0.0.1',
$http_port = '8080',
$mysql_host = '127.0.0.1',
$mysql_name = 'grafana',
$mysql_user = 'grafana',
$project_config_repo = '',
$secret_key = '',
$vhost_name = $::fqdn,
) {
@ -40,8 +43,8 @@ class openstack_project::grafana (
secret_key => $secret_key,
},
'server' => {
http_addr => '127.0.0.1',
http_port => 8080,
http_addr => $http_host,
http_port => $http_port,
},
'users' => {
allow_sign_up => false,
@ -76,4 +79,14 @@ class openstack_project::grafana (
httpd_mod { 'proxy_http':
ensure => present,
}
class { '::project_config':
url => $project_config_repo,
}
class { '::grafyaml':
config_dir => $::project_config::grafana_dashboards_dir,
grafana_url => "http://${admin_user}:${admin_password}@${http_host}:${http_port}",
require => Class['grafana'],
}
}