rename cluster levels to non-underscore names

Change-Id: Ic9bdafbeb1333699ce424612f8b2e8d8dafb7be2
diff --git a/classes/cluster/sl-k8s-calico/stacklight/client.yml b/classes/cluster/sl-k8s-calico/stacklight/client.yml
new file mode 100644
index 0000000..dbad497
--- /dev/null
+++ b/classes/cluster/sl-k8s-calico/stacklight/client.yml
@@ -0,0 +1,20 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- cluster.sl-k8s-calico
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    # Grafana client parameters
+    grafana_address: ${_param:stacklight_monitor_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
+    grafana_prometheus_port: 15010
diff --git a/classes/cluster/sl-k8s-calico/stacklight/init.yml b/classes/cluster/sl-k8s-calico/stacklight/init.yml
new file mode 100644
index 0000000..3237575
--- /dev/null
+++ b/classes/cluster/sl-k8s-calico/stacklight/init.yml
@@ -0,0 +1,61 @@
+classes:
+- service.grafana.collector
+- system.linux.system.repo.mcp.extra
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- system.prometheus.collector
+- system.telegraf.agent
+parameters:
+  _param:
+    stacklight_monitor_address: 172.16.10.252
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+
+    # Glusterfs
+    glusterfs_service_host: ${_param:stacklight_monitor_address}
+
+    # Prometheus
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+
+    mysql_grafana_password: password
+    cluster_local_address: ${_param:single_address}
+    galera_server_cluster_name: monitoring_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+    system:
+      name: ${_param:infra_config_hostname}
+      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-calico/stacklight/proxy.yml b/classes/cluster/sl-k8s-calico/stacklight/proxy.yml
new file mode 100644
index 0000000..de4e28c
--- /dev/null
+++ b/classes/cluster/sl-k8s-calico/stacklight/proxy.yml
@@ -0,0 +1,18 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.sl-k8s-calico
+parameters:
+  _param:
+    cluster_public_host: ${_param:prometheus_control_address}
+    nginx_proxy_grafana_port: 15013
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
new file mode 100644
index 0000000..dae5452
--- /dev/null
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -0,0 +1,87 @@
+classes:
+- system.docker.host
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.tcp_elastic
+- system.linux.system.repo.glusterfs
+# Needed to install Galera packages
+- system.linux.system.repo.mcp.openstack
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- service.haproxy.proxy.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.prometheus
+- system.glusterfs.server.cluster
+- system.glusterfs.server.volume.prometheus
+- system.galera.server.cluster
+- system.galera.server.database.grafana
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
+- system.salt.minion.cert.prometheus_server
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.dashboard
+- cluster.sl-k8s-calico
+parameters:
+  _param:
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
+    cluster_public_host: mon
+    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+    docker_image_grafana: grafana/grafana:4.3.2
+    docker_influxdb_image: influxdb:1.2
+    grafana_admin_password: admin
+    keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
+    keepalived_prometheus_vip_password: password
+    keepalived_prometheus_vip_interface: ens4
+    # Docker/Elasticsearch
+    cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+    # Galera
+    galera_innodb_buffer_pool_size: 1024M
+    galera_max_connections: 200
+    # Kibana
+    kibana_elasticsearch_host: ${_param:cluster_vip_address}
+    # Galera
+    openstack_version: newton
+    # Grafana
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:cluster_vip_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
+    influxdb_port: 8086
+    influxdb_admin_password: password
+    influxdb_stacklight_password: lmapass
+    influxdb_client_host: ${_param:stacklight_monitor_address}
+    influxdb_client_port: ${_param:influxdb_port}
+    influxdb_client_password: ${_param:influxdb_admin_password}
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+    prometheus_influxdb_db: prometheus
+    prometheus_influxdb_username: lma
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    rabbitmq_openstack_password: workshop
+    heka_amqp_host: ${_param:kubernetes_control_address}
+  elasticsearch:
+    server:
+      heap:
+        size: 1
+  keepalived:
+    cluster:
+      instance:
+        VIP:
+          enabled: false