From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Tue, 5 Jun 2018 15:18:42 +0000 (+0000)
Subject: Merge "Adding logging for the main CLAMP"
X-Git-Tag: 2.0.0-ONAP~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6302da0c75a763ce1cf18e14cd53c2791dce7ae0;hp=-c;p=oom.git

Merge "Adding logging for the main CLAMP"
---

6302da0c75a763ce1cf18e14cd53c2791dce7ae0
diff --combined kubernetes/clamp/values.yaml
index 5ecab2090f,180e3f5983..2c155967fb
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@@ -37,6 -37,9 +37,9 @@@ debugEnabled: fals
  # Application configuration defaults.
  #################################################################
  config:
+   log:
+     logstashServiceName: log-ls
+     logstashPort: 5044
    mysqlPassword: strong_pitchou
    dataRootDir: /dockerdata-nfs
    springApplicationJson: >
@@@ -48,12 -51,12 +51,12 @@@
          "clamp.config.sdc.serviceUsername": "clamp",
          "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
          "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json",
 -        "clamp.config.dcae.inventory.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080",
 -        "clamp.config.dcae.dispatcher.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080",
 -        "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123",
 -        "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123",
 -        "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:8443/pap/ , testpap, alpha123",
 -        "clamp.config.policy.clientKey": "5CE79532B3A2CB4D132FC0C04BF916A7"
 +        "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080",
 +        "clamp.config.dcae.dispatcher.url": "http://deployment-handler.{{ include "common.namespace" . }}:8443",
 +        "clamp.config.policy.pdpUrl1": "http://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
 +        "clamp.config.policy.pdpUrl2": "http://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
 +        "clamp.config.policy.papUrl": "http://pap.{{ include "common.namespace" . }}:9091/pap/ , testpap, alpha123",
 +        "clamp.config.policy.clientKey": "dGVzdA=="
      }
  
  # subchart configuration