Merge "Add alerta UI for prometheus alerts"
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 7a73f01..ae8c4d3 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -275,6 +275,10 @@
type: boolean
default: "{{run_smoke}}"
description: Enabling of running smoke tests
+ ARTIFACTORY_CREDENTIALS:
+ type: string
+ default: "artifactory"
+ description: Jenkins credential ID for Artifactory
SALT_MASTER_CREDENTIALS:
type: string
default: "salt-qa-credentials"
diff --git a/mongodb/server/cluster.yml b/mongodb/server/cluster.yml
index 02294c4..54dd1bb 100644
--- a/mongodb/server/cluster.yml
+++ b/mongodb/server/cluster.yml
@@ -2,13 +2,13 @@
- service.mongodb.server.cluster
parameters:
_param:
- openstack_telemetry_node01_hostname: mdb01
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_hostname: mdb03
- mongodb_server_replica_set: mongodb
- mongodb_master: ${_param:openstack_telemetry_node01_hostname}
- mongodb_server_members:
- - host: ${_param:openstack_telemetry_node01_hostname}
- priority: 2
- - host: ${_param:openstack_telemetry_node02_hostname}
- - host: ${_param:openstack_telemetry_node03_hostname}
+ mongodb_replica_set: stacklight
+ mongodb:
+ server:
+ replica_set: ${_param:mongodb_replica_set}
+ members:
+ - host: ${_param:cluster_node01_address}
+ priority: 2
+ - host: ${_param:cluster_node02_address}
+ - host: ${_param:cluster_node03_address}
+ master: ${_param:cluster_node01_hostname}
diff --git a/mongodb/server/single.yml b/mongodb/server/single.yml
index c3d6cca..8a08de0 100644
--- a/mongodb/server/single.yml
+++ b/mongodb/server/single.yml
@@ -2,4 +2,4 @@
- service.mongodb.server.single
parameters:
_param:
- mongodb_server_replica_set: ceilometer
+ mongodb_server_replica_set: stacklight
diff --git a/salt/master/formula/git/logrotate.yml b/salt/master/formula/git/logrotate.yml
new file mode 100644
index 0000000..6fcf681
--- /dev/null
+++ b/salt/master/formula/git/logrotate.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ logrotate:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-logrotate.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/saltstack.yml b/salt/master/formula/git/saltstack.yml
index fde03ef..d7dde48 100644
--- a/salt/master/formula/git/saltstack.yml
+++ b/salt/master/formula/git/saltstack.yml
@@ -1,3 +1,5 @@
+classes:
+- system.salt.master.formula.git.logrotate
parameters:
salt:
master:
diff --git a/salt/master/formula/pkg/logrotate.yml b/salt/master/formula/pkg/logrotate.yml
new file mode 100644
index 0000000..0cfa0e6
--- /dev/null
+++ b/salt/master/formula/pkg/logrotate.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ logrotate:
+ source: pkg
+ name: salt-formula-logrotate
diff --git a/salt/master/formula/pkg/saltstack.yml b/salt/master/formula/pkg/saltstack.yml
index a62a272..963580c 100644
--- a/salt/master/formula/pkg/saltstack.yml
+++ b/salt/master/formula/pkg/saltstack.yml
@@ -1,3 +1,5 @@
+classes:
+- system.salt.master.formula.pkg.logrotate
parameters:
salt:
master: