remote_collector got back
We still need CADF notifications for both fluentd and heka based
solutions, let's get back remote_collector.
Change-Id: I269b0823057023aeed863b5261a043b3cd99ae4e
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 5f1175e..a0a2907 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -608,11 +608,9 @@
// Configure Prometheus in Docker Swarm
salt.enforceState(master, 'I@docker:swarm and I@prometheus:server', 'prometheus', true, false)
- //Configure Remote Collector in Docker Swarm for Openstack deployments without fluentd
+ //Configure Remote Collector in Docker Swarm for Openstack deployments
if (!common.checkContains('STACK_INSTALL', 'k8s')) {
- if (!salt.testTarget(master, 'I@fluentd:agent')) {
- salt.enforceState(master, 'I@docker:swarm and I@prometheus:server', 'heka.remote_collector', true, false)
- }
+ salt.enforceState(master, 'I@docker:swarm and I@prometheus:server', 'heka.remote_collector', true, false)
}
//Configure Grafana