x
/
fuel-plugin-influxdb-grafana
Code Issues Proposed changes

Remove calls to hiera('influxdb_grafana') in manifests but hiera.pp 

Change-Id: I39e5c2c7e4427195a4a54c9135e1c30c1cf0b5e7
This commit is contained in:
Guillaume Thouvenin 2016-06-22 11:24:54 +02:00
parent 7bf3b41572
commit 92cb859434
7 changed files with 79 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
deployment_scripts/puppet/manifests/grafana.pp
View File

@ -14,13 +14,21 @@
notice('fuel-plugin-influxdb-grafana: grafana.pp')
$influxdb_grafana = hiera('influxdb_grafana')
$db_mode = $influxdb_grafana['mysql_mode']
$db_name = $influxdb_grafana['mysql_dbname']
$db_username = $influxdb_grafana['mysql_username']
$db_password = $influxdb_grafana['mysql_password']
$admin_username = $influxdb_grafana['grafana_username']
$admin_password = $influxdb_grafana['grafana_userpass']
$db_mode = hiera('lma::grafana::mysql::mode')
case $db_mode {
'local': {
$db_host = join([hiera('database_vip'), '3306'], ':')
}
'remote': {
$db_host = hiera('lma::grafana::mysql::host')
}
default: {
fail("'${db_mode}' database mode not supported for Grafana")
}
}
$ldap_enabled = hiera('lma::grafana::ldap::enabled')
if $ldap_enabled {
@ -42,28 +50,13 @@ if $ldap_enabled {
$ldap_parameters = undef
}
case $db_mode {
'local': {
$db_host = join([hiera('database_vip'), '3306'], ':')
}
'remote': {
$db_host = $influxdb_grafana['mysql_host']
}
default: {
fail("'${db_mode}' database mode not supported for Grafana")
}
}
class {'lma_monitoring_analytics::grafana':
db_host => $db_host,
db_name => $db_name,
db_username => $db_username,
db_password => $db_password,
admin_username => $admin_username,
admin_password => $admin_password,
db_name => hiera('lma::grafana::mysql::dbname'),
db_username => hiera('lma::grafana::mysql::username'),
db_password => hiera('lma::grafana::mysql::password'),
admin_username => hiera('lma::grafana::mysql::admin_username'),
admin_password => hiera('lma::grafana::mysql::admin_password'),
domain => hiera('lma::influxdb::vip'),
http_port => hiera('lma::influxdb::grafana_port'),
version => '3.0.4-1464167696',

12
deployment_scripts/puppet/manifests/grafana_configuration.pp
View File

@ -19,13 +19,13 @@ $master_ip = hiera('master_ip')
$vip = hiera('lma::influxdb::vip')
$grafana_port = hiera('lma::influxdb::grafana_port')
$influxdb_port = hiera('lma::influxdb::influxdb_port')
$influxdb_grafana = hiera('influxdb_grafana')
$grafana_link_created_file = '/var/cache/grafana_link_created'
$admin_username = $influxdb_grafana['grafana_username']
$admin_password = $influxdb_grafana['grafana_userpass']
$influxdb_username = $influxdb_grafana['influxdb_username']
$influxdb_password = $influxdb_grafana['influxdb_userpass']
$influxdb_database = $influxdb_grafana['influxdb_dbname']
$admin_username = hiera('lma::grafana::mysql::admin_username')
$admin_password = hiera('lma::grafana::mysql::admin_password')
$influxdb_username = hiera('lma::influxdb::username')
$influxdb_password = hiera('lma::influxdb::password')
$influxdb_database = hiera('lma::influxdb::dbname')
$lma_collector = hiera_hash('lma_collector', {})
$influxdb_mode = $lma_collector['influxdb_mode']

9
deployment_scripts/puppet/manifests/grafana_mysql.pp
View File

@ -14,11 +14,10 @@
notice('fuel-plugin-influxdb-grafana: grafana_mysql.pp')
$influxdb_grafana = hiera('influxdb_grafana')
$is_mysql_server = roles_include(['standalone-database',
'primary-standalone-database'])
if $influxdb_grafana['mysql_mode'] == 'local' {
if hiera('lma::grafana::mysql::mode') == 'local' {
$mysql = hiera_hash('mysql')
$db_vip = hiera('database_vip')
$db_admin_user = 'root'
@ -30,9 +29,9 @@ user=<%= @db_admin_user %>
password=<%= @db_admin_pass %>
host=<%= @db_vip %>
')
$db_name = $influxdb_grafana['mysql_dbname']
$db_username = $influxdb_grafana['mysql_username']
$db_password = $influxdb_grafana['mysql_password']
$db_name = hiera('lma::grafana::mysql::dbname')
$db_username = hiera('lma::grafana::mysql::username')
$db_password = hiera('lma::grafana::mysql::password')
file { $db_options_file:
ensure => file,

35
deployment_scripts/puppet/manifests/hiera.pp
View File

@ -35,6 +35,22 @@ $leader_ip_address = $leader_ip_addresses[0]
$influxdb_others = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
$others_ip_addresses = sort(values(get_node_to_ipaddr_map_by_network_role($influxdb_others, 'influxdb_vip')))
$influxdb_admin_password = $influxdb_grafana['influxdb_rootpass']
$influxdb_username = $influxdb_grafana['influxdb_username']
$influxdb_password = $influxdb_grafana['influxdb_userpass']
$influxdb_dbname = $influxdb_grafana['influxdb_dbname']
$retention_period = $influxdb_grafana['retention_period']
# Parameters related to MySQL
$host = $influxdb_grafana['mysql_host']
$db_mode = $influxdb_grafana['mysql_mode']
$db_name = $influxdb_grafana['mysql_dbname']
$db_username = $influxdb_grafana['mysql_username']
$db_password = $influxdb_grafana['mysql_password']
$admin_username = $influxdb_grafana['grafana_username']
$admin_password = $influxdb_grafana['grafana_userpass']
$tls_enabled = $influxdb_grafana['tls_enabled']
if $tls_enabled {
$grafana_hostname = $influxdb_grafana['grafana_hostname']
@ -101,6 +117,25 @@ lma::corosync_roles:
- primary-influxdb_grafana
- influxdb_grafana
# The replication factor is always 3 to support scaling up the cluster
# from 1 or 2 nodes to 3 nodes.
lma::influxdb::replication_factor: 3
lma::influxdb::retention_period: <%= @retention_period %>
lma::influxdb::admin_username: "root"
lma::influxdb::admin_password: <%= @influxdb_admin_password %>
lma::influxdb::username: <%= @influxdb_username %>
lma::influxdb::password: <%= @influxdb_password %>
lma::influxdb::dbname: <%= @influxdb_dbname %>
lma::grafana::mysql::host: <%= @host %>
lma::grafana::mysql::mode: <%= @db_mode %>
lma::grafana::mysql::dbname: <%= @db_name %>
lma::grafana::mysql::username: <%= @db_username %>
lma::grafana::mysql::password: <%= @db_password %>
lma::grafana::mysql::admin_username: <%= @admin_username %>
lma::grafana::mysql::admin_password: <%= @admin_password %>
lma::grafana::tls::enabled: <%= @tls_enabled %>
<% if @tls_enabled -%>
lma::grafana::tls::hostname: "<%= @grafana_hostname %>"

14
deployment_scripts/puppet/manifests/influxdb_configuration.pp
View File

@ -20,14 +20,12 @@ $local_address = hiera('lma::influxdb::listen_address')
$local_port = hiera('lma::influxdb::influxdb_port')
$influxdb_url = "http://${local_address}:${local_port}"
$influxdb_grafana = hiera('influxdb_grafana')
$admin_user = 'root'
$admin_password = $influxdb_grafana['influxdb_rootpass']
$username = $influxdb_grafana['influxdb_username']
$password = $influxdb_grafana['influxdb_userpass']
$retention_period = $influxdb_grafana['retention_period']
$replication_factor = $influxdb_grafana['replication_factor']
$admin_user = hiera('lma::influxdb::admin_username')
$admin_password = hiera('lma::influxdb::admin_password')
$username = hiera('lma::influxdb::username')
$password = hiera('lma::influxdb::password')
$retention_period = hiera('lma::influxdb::retention_period')
$replication_factor = hiera('lma::influxdb::replication_factor')
lma_monitoring_analytics::influxdb_user { $admin_user:
password => $admin_password,

16
deployment_scripts/puppet/modules/lma_monitoring_analytics/manifests/grafana.pp
View File

@ -19,14 +19,14 @@ class lma_monitoring_analytics::grafana (
$db_name,
$db_username,
$db_password,
$admin_username = undef,
$admin_password = undef,
$domain = $lma_monitoring_analytics::params::grafana_domain,
$http_address = $lma_monitoring_analytics::params::grafana_address,
$http_port = $lma_monitoring_analytics::params::grafana_port,
$ldap_enabled = false,
$ldap_parameters = undef,
$version = 'latest',
$admin_username = undef,
$admin_password = undef,
$domain = $lma_monitoring_analytics::params::grafana_domain,
$http_address = $lma_monitoring_analytics::params::grafana_address,
$http_port = $lma_monitoring_analytics::params::grafana_port,
$ldap_enabled = false,
$ldap_parameters = undef,
$version = 'latest',
) inherits lma_monitoring_analytics::params {
validate_string($db_host)

12
environment_config.yaml
View File

@ -10,18 +10,6 @@ attributes:
source: '^\d+$'
error: "You must provide a number"
replication_factor:
value: '3'
label: 'Replication factor'
description: 'The number of replicas'
weight: 6
type: "text"
regex: *number_validation
# Don't expose the replication factor while clustering is alpha
restrictions:
- condition: "true"
action: hide
influxdb_rootpass:
value: ''
label: 'Root password'