Revert "Removed ES_USER and ES_PASSORD"

This reverts commit b40cca7.
SpringerPE · Nov 28, 2018 · bd405a3 · bd405a3
1 parent 6257ef3
commit bd405a3
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 0 deletions.
diff --git a/manifest/operations/pipelines/cf-apps-es-mirroring.yml b/manifest/operations/pipelines/cf-apps-es-mirroring.yml
@@ -8,6 +8,16 @@
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value:

diff --git a/manifest/operations/pipelines/cf-apps-es-throttling-stdout-debug.yml b/manifest/operations/pipelines/cf-apps-es-throttling-stdout-debug.yml
@@ -8,6 +8,16 @@
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value:

diff --git a/manifest/operations/pipelines/cf-apps-es-throttling.yml b/manifest/operations/pipelines/cf-apps-es-throttling.yml
@@ -8,6 +8,16 @@
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value:

diff --git a/manifest/operations/pipelines/cf-apps-es.yml b/manifest/operations/pipelines/cf-apps-es.yml
@@ -8,6 +8,16 @@
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value:

diff --git a/manifest/operations/pipelines/cf-platform-es.yml b/manifest/operations/pipelines/cf-platform-es.yml
@@ -8,6 +8,16 @@
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value:

diff --git a/manifest/operations/pipelines/generate_pipeline_operations.sh b/manifest/operations/pipelines/generate_pipeline_operations.sh
@@ -45,6 +45,16 @@ add_oper_snippets() {
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value:

diff --git a/manifest/operations/pipelines/on-prem-logstash-conf.yml b/manifest/operations/pipelines/on-prem-logstash-conf.yml
@@ -8,6 +8,16 @@
   value:
     "((es-host))"
 
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_USER?
+  value:
+    "((es-user))"
+
+- type: replace
+  path: /instance_groups/name=logstash/properties/logstash/env/ES_PASSWORD?
+  value:
+    "((es-password))"
+
 - type: replace
   path: /instance_groups/name=logstash/properties/logstash/env/ES_INDEX_PREFIX?
   value: