update default certificate

update default certificate

Issue-ID: CLAMP-945

Change-Id: I7b88a999b5edde29d3f13da3adb6346920c36c2f
Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>

7 files changed, 110 insertions, 122 deletions

diff --git a/src/main/docker/elasticsearch/config/ca-certs.pem b/src/main/docker/elasticsearch/config/ca-certs.pem
index 70bb844..bf61a81 100644
--- a/src/main/docker/elasticsearch/config/ca-certs.pem
+++ b/src/main/docker/elasticsearch/config/ca-certs.pem
@@ -1,9 +1,7 @@
 Bag Attributes
     friendlyName: CN=intermediateCA_9,OU=OSAAF,O=ONAP,C=US
-subject=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-
-issuer=OU = OSAAF, O = ONAP, C = US
-
+subject=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_9
+issuer=/OU=OSAAF/O=ONAP/C=US
 -----BEGIN CERTIFICATE-----
 MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
 RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN
diff --git a/src/main/docker/elasticsearch/config/clamp-key.pem b/src/main/docker/elasticsearch/config/clamp-key.pem
index bcbb9f1..8c21b94 100644
--- a/src/main/docker/elasticsearch/config/clamp-key.pem
+++ b/src/main/docker/elasticsearch/config/clamp-key.pem
@@ -1,32 +1,32 @@
 Bag Attributes
     friendlyName: clamp@clamp.onap.org
-    localKeyID: 54 69 6D 65 20 31 35 38 30 38 32 39 30 36 35 34 37 39 
+    localKeyID: 54 69 6D 65 20 31 35 39 39 37 33 36 33 37 37 31 30 30 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCTB30nMh0hczIk
-vWJo7Omg7cAHhz50NBhLB7u+60oXRGCya4SqssqqxNnNqNQQP9MmflW2q/bZepWn
-8Rk23X6CLmoIUlrj8BMPkUCRqzgvlaWPSNAK5QcOp6GUvXTuX4EsaWxJhbs9Ujz2
-+qi137iNOqfAx1sUygah1kjALrqHkXDqJGvIfxU5ES0akBi/lB7A3WpE52KTioSF
-JS5Kbnpj1ogffGNKyAiNqU61LcF1FjWmINat2z3ZMk/3Xm+HCDg/GLPnbh4E1KoE
-10O22AMys6YGEyPvgRfrTF13DsDX52PmmUHbkSB6kwS/CeV5Uu++8b6T2IWpPyZ2
-+5ptmL+tAgMBAAECggEBAIUplzRUswWEq7mSvPqC9+YE7pLi7rGYLRhnXKdBuszv
-5RQzROjFHcEkoI8fhVFiPP70FPVpMh0uZTTBrDCA0v9cwjPfQuqGmPzUdUJ5bF3M
-jzICpEn5vDaNpE5ueOUcIoXyxVyhfj+/p++YfgybHy7qHN0AsYFWqEMTLLjCmbYF
-pZozbAcGQoAR8PSfwuvgusuEezrhYertHsdFwlfZhDtJvnm/4YKRUVEBzuaaA7B9
-sUhnQFS8ScqiUbkAGdjfY9wOYRHnQgjtqiP8poIzLkqCNSoVctgh5Pdv4jp4HO90
-J5QC+f7m7rOoWUw8EYbRo/4C4Mckh0GQQ+oP4xzrtZECgYEA3DYALFgOEY+0RR1K
-61HAKqdNy1YbeuidpCBEJEwmIbzdgO1DcJdNznbfdRlmS7VB9orwRfNbf7Hxm2w/
-/xn9USENXWx7fvDoISqSDegvEsBSq5hSEMVl3f7CfQZrYl1f6gxfe7L/jtmbn0eQ
-avsr9RaUCWP794DEXKuA9pC8hVsCgYEAquy5I4hO4jNBQ6v5+omjsEgk4513/RNs
-f47Md8bsDHKJMbCMKCdqM1D3J1xbgV3DgSv0yNlKdU2wenWdgQAyBtz18NBgno85
-YNanFhp1CymgLFHdLJHSOqAkzutSuCNnGTT6AKspOQvy+cuj7XsnbsxtYK3Cgw5h
-Mom3RnUy9ZcCgYAnForHVEYDBgAYuI9g39z9dT8Q1dMA6SN6S6Ps0Xt/R5gF15e9
-941/FYiqr3yB+cWgrp7hu8XFD9/0F63waTuW2AgYSjZNnROHN5g/UbRxXqQOA3al
-tXRUiHEbYjVTe4GX+ORF/8rvH19JUZmn87ekxII4fH/wOfIhBOxaV+yuuwKBgHtz
-5Tizz/3y9TWSdkgtt6uwP+yipLKGn/v1wNrWM1G+PDdGg8TQyxTrasfkHjdu6LFY
-dUHIJ85X4ZphbvRolrl8SKq5Zr+/RLsb7qy5SUZZt1Wrfysc25H6bvuA3ksfTuzW
-5acr+Oc6KTGgkvMI229cebe1aONNtIhTDav3JGpbAoGAX5DQvNreqnP8qSAvUN2I
-TAHXIzawR3f6vgGgVIdkHkiS2eKzs/fgP3VAK80TbrGSR8HvBcPEcR/icOn1u/e6
-tDp0j6mGt5aPKK9VQkBn94bW35T12FUbdB+L8FWWTUrfiVWJtEW8tEsKil5ac8U4
-Bn3vC5WUeKhW6v6kD4AigqE=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCvkoshMuO4Nhmj
+MeqqYdPlPxCTErFcIC7ppqLW50MCeCtgvpAcOAr/nbtPKN0UxCupE6bK+LfScWUY
+g8e9Y1yrHXcTTwohIPEIPYzHdJYiuhAgUj/VXfdESW49NuWPWFOhkUQaa4IhRlF2
+eJ1WIqRgEqedZCxWecykzKysDdL08z3DRc+8yoGZJ6OZw4CBmyRzMRF77evOmj6K
+eD+na/VrIZivJOvm4sA4eoTmti2q2NApChr5Zoq9XjGDGYVkj1XAvAoVB20KY4xB
+DwdiYDyW7TWRMbTi8mw9vpblmv2nx+I/1+tj6RUvW6NQNh+bpEI+zyQN31KrPMfE
+4h7xSqbHAgMBAAECggEAHlLKEs7OQ8ecP/JkHE9PIJ32x+AHn+izEYnFQCarDSci
+HtBq5WTMiX99lVtya57CB66sNQwl+4O4OTaxbcVWgPtS0JPrJPOijZDL2rsJHzBR
+jrOF8N0M0s936bysg0h3EUWcpI+C5ypU8Yg9bF4JU8qFBosBmWHp9WCgRgsRL1r1
+bKV1zyq80mbY26nv3FAWhcVvMFX9BvUx0SZCD/hYJq0DRREXlPpxlhOdm3qXYnKQ
+RjVFq+ccCfb+J/e9ryFohg9NfHZZ2B2VJgAXxjWuIGpmqczW70rN5NwYYLiPGulr
+3KOk5OfXUbImH1OVhE3gxZkqx9McKM3j8NgsWK+viQKBgQD3HptEtEzf3pRThr50
+ViOPU6DM2EcoXFKTtBzapp9Oz4wecIOzbfGtm03gB9V8dWsPiCQbVRQr7GcnBzH/
+NOcYKbZsC0kuJL9mJFXhRPSvk7Kochs+n1wZVdKl8ugSW2Olqb834li/taAIyevJ
+JZ6gZpYb17J72NQwu1OGZyAJfQKBgQC14bv4aqh34m8NV9Mklx/bAzP4PqnJMTqZ
+kqnB0UWxgjQ/u6uKtKZJ5n5dpebBsgx2CxhBhVGrqqa/mb0DK3LIPkE5FPExypTx
+w36NwtRTuNR6zBheJsd9GAzvDWkraBAKDxXLTygn2F+rluufOM/Y/w6pg93Q91Fv
+pRFcsuBEkwKBgCLyXRrWNJjkLS2yvHRPSjAWr4LIgyeeBr+ElSAGuDi4+SPE3Zse
+TTMz50trUDGNmVpU8mY7HeMoR14pklR48sVkALw+zFaOM9MKCGsXCVNbG8TefiPY
+/XlHvcZiF5eg/PKMktIgXFSgJsWXaJTFkS011LyTQFZrT3akxycWpl0xAoGAMq/u
+CpTuzjo0aKuJFDFpl0eVPCF6f69QfWv6EyGXIpj+pqROciFWFlI99Ss+28wa3OrK
+n7ffws+UGOFnY3LAUj3HP3kunomuaJHquucI9SwVSwOF5vc3sQz6zcQXAxnFHoiF
+slsk/bW3M8Kjd4QFqJusImG1d371GwANjp/rEDECgYA+MVukCjwwFVl3SbLdrfmJ
+W1ZHWsLWLoj177sdsym/MhaBqnEkBxhwkwH7oUC/xw1Py0I+Gz5SV7h/Rt1OuZ2o
+WvkIqUERHvpbBAGIa6VPGB4CevsihNBU80YGFToZqqBE8e8fxRTAYMFYfy7D/ulm
+rsIRjFAuzkoFCIEifrGazQ==
 -----END PRIVATE KEY-----
diff --git a/src/main/docker/elasticsearch/config/clamp.pem b/src/main/docker/elasticsearch/config/clamp.pem
index a01b587..671d54b 100644
--- a/src/main/docker/elasticsearch/config/clamp.pem
+++ b/src/main/docker/elasticsearch/config/clamp.pem
@@ -1,33 +1,30 @@
 Bag Attributes
     friendlyName: clamp@clamp.onap.org
-    localKeyID: 54 69 6D 65 20 31 35 38 30 38 32 39 30 36 35 34 37 39 
-subject=CN = clamp, emailAddress = mark.d.manager@people.osaaf.com, OU = clamp@clamp.onap.org:DEV, OU = OSAAF, O = ONAP, C = US
-
-issuer=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-
+    localKeyID: 54 69 6D 65 20 31 35 39 39 37 33 36 33 37 37 31 30 30 
+subject=/CN=clamp/OU=clamp@clamp.onap.org:DEV/OU=OSAAF/O=ONAP/C=US
+issuer=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_9
 -----BEGIN CERTIFICATE-----
-MIIEWDCCA0CgAwIBAgIILw1zyDGqB5IwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
+MIIESjCCAzKgAwIBAgIIQLhbMnfN9DUwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
 BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp
-bnRlcm1lZGlhdGVDQV85MB4XDTIwMDIwNDEyMjM1MloXDTIxMDIwNDEyMjM1Mlow
-gY8xDjAMBgNVBAMMBWNsYW1wMS4wLAYJKoZIhvcNAQkBFh9tYXJrLmQubWFuYWdl
-ckBwZW9wbGUub3NhYWYuY29tMSEwHwYDVQQLDBhjbGFtcEBjbGFtcC5vbmFwLm9y
-ZzpERVYxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJV
-UzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMHfScyHSFzMiS9Ymjs
-6aDtwAeHPnQ0GEsHu77rShdEYLJrhKqyyqrE2c2o1BA/0yZ+Vbar9tl6lafxGTbd
-foIuaghSWuPwEw+RQJGrOC+VpY9I0ArlBw6noZS9dO5fgSxpbEmFuz1SPPb6qLXf
-uI06p8DHWxTKBqHWSMAuuoeRcOoka8h/FTkRLRqQGL+UHsDdakTnYpOKhIUlLkpu
-emPWiB98Y0rICI2pTrUtwXUWNaYg1q3bPdkyT/deb4cIOD8Ys+duHgTUqgTXQ7bY
-AzKzpgYTI++BF+tMXXcOwNfnY+aZQduRIHqTBL8J5XlS777xvpPYhak/Jnb7mm2Y
-v60CAwEAAaOB/jCB+zAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAgBgNVHSUB
-Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVAYDVR0jBE0wS4AUgfeZWxC5yIze
-81Je6k5poEM+rN2hMKQuMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQ
-MQswCQYDVQQGEwJVU4IBBzAdBgNVHQ4EFgQUzfIed+18wgFs7E6q0b6BbMICtfsw
-RwYDVR0RBEAwPoIFY2xhbXCCCmNsYW1wLW9uYXCCHWNsYW1wLmFwaS5zaW1wbGVk
-ZW1vLm9uYXAub3JnggpjbGFtcC5vbmFwMA0GCSqGSIb3DQEBCwUAA4IBAQBizhsW
-XrJ9wQy3PrBxgh90sOF15tayXPRZSFYPoQb5LhRh3IY/PvXLaSHlkgPHlCLLx36S
-0/DiVf86/83ABvyaq9gJIyg/m4ntNae23OKH1AkA1aN+JCKA8yhsAzDBcRF6Aj7E
-VJ+vQlSzz5oh+efP1e/8DUMd1/WwbTXvRd0Iqv/fyZunbjb82qNMrsK1mQ2q+87A
-0jx9u1EdeMihP6vWiuKzlwy4mKoNT573SPpvaOkjX3yDlmf2CTQZ9vdAvjmFmVsH
-1wyrNZOIgW4VjluiZfAk3mOEskrZiP/7aUXnxmNnYTpgZMbhiouLbRrTc4lLEyhx
-G7A61/KGTsLZlvxb
+bnRlcm1lZGlhdGVDQV85MB4XDTIwMDkxMDExMTI1NloXDTIxMDkxMDExMTI1Nlow
+XzEOMAwGA1UEAwwFY2xhbXAxITAfBgNVBAsMGGNsYW1wQGNsYW1wLm9uYXAub3Jn
+OkRFVjEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVT
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr5KLITLjuDYZozHqqmHT
+5T8QkxKxXCAu6aai1udDAngrYL6QHDgK/527TyjdFMQrqROmyvi30nFlGIPHvWNc
+qx13E08KISDxCD2Mx3SWIroQIFI/1V33REluPTblj1hToZFEGmuCIUZRdnidViKk
+YBKnnWQsVnnMpMysrA3S9PM9w0XPvMqBmSejmcOAgZskczERe+3rzpo+ing/p2v1
+ayGYryTr5uLAOHqE5rYtqtjQKQoa+WaKvV4xgxmFZI9VwLwKFQdtCmOMQQ8HYmA8
+lu01kTG04vJsPb6W5Zr9p8fiP9frY+kVL1ujUDYfm6RCPs8kDd9SqzzHxOIe8Uqm
+xwIDAQABo4IBIDCCARwwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwIAYDVR0l
+AQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRNMEuAFIH3mVsQuciM
+3vNSXupOaaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05B
+UDELMAkGA1UEBhMCVVOCAQcwHQYDVR0OBBYEFE9V3RSjFsDHLDv0k0TNstAxH5pc
+MGgGA1UdEQRhMF+BH21hcmsuZC5tYW5hZ2VyQHBlb3BsZS5vc2FhZi5jb22CBWNs
+YW1wggpjbGFtcC1vbmFwgh1jbGFtcC5hcGkuc2ltcGxlZGVtby5vbmFwLm9yZ4IK
+Y2xhbXAub25hcDANBgkqhkiG9w0BAQsFAAOCAQEAP3FYxCPd7K/Xxy8NDx2umU46
+/pTgeqRzS9IawQw1dYNxR1D3AmKdrac+++gGqF+7TkGUrDM9vgGF7uyAbo2YKghC
+EL+3UEkkW1SgAN/YxxD/JEXqhs2CVTWfq8Lt8Z38V+JZcHUYJF2ge9taOvWHWcLf
+Qv9IvPpAdmfZexKdlaXwzrePD19YeWwow+THyoc+blWwOzx3huYJlra8W5qpoUBc
+OHyrShhALEMqeJV5GSFaKOdQJ62g5wRb1ixSmf3cD6MgiJ7D1/++y9v8N3lre2h+
+cWTjTy1WnaiC4veYJseI/zar52czbAmB0NvVxNGqB8MPtLyBDXLUgw4ozlAzlg==
 -----END CERTIFICATE-----
diff --git a/src/main/docker/kibana/conf/keystore/org.onap.clamp.crt.pem b/src/main/docker/kibana/conf/keystore/org.onap.clamp.crt.pem
index a01b587..671d54b 100644
--- a/src/main/docker/kibana/conf/keystore/org.onap.clamp.crt.pem
+++ b/src/main/docker/kibana/conf/keystore/org.onap.clamp.crt.pem
@@ -1,33 +1,30 @@
 Bag Attributes
     friendlyName: clamp@clamp.onap.org
-    localKeyID: 54 69 6D 65 20 31 35 38 30 38 32 39 30 36 35 34 37 39 
-subject=CN = clamp, emailAddress = mark.d.manager@people.osaaf.com, OU = clamp@clamp.onap.org:DEV, OU = OSAAF, O = ONAP, C = US
-
-issuer=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-
+    localKeyID: 54 69 6D 65 20 31 35 39 39 37 33 36 33 37 37 31 30 30 
+subject=/CN=clamp/OU=clamp@clamp.onap.org:DEV/OU=OSAAF/O=ONAP/C=US
+issuer=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_9
 -----BEGIN CERTIFICATE-----
-MIIEWDCCA0CgAwIBAgIILw1zyDGqB5IwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
+MIIESjCCAzKgAwIBAgIIQLhbMnfN9DUwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
 BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp
-bnRlcm1lZGlhdGVDQV85MB4XDTIwMDIwNDEyMjM1MloXDTIxMDIwNDEyMjM1Mlow
-gY8xDjAMBgNVBAMMBWNsYW1wMS4wLAYJKoZIhvcNAQkBFh9tYXJrLmQubWFuYWdl
-ckBwZW9wbGUub3NhYWYuY29tMSEwHwYDVQQLDBhjbGFtcEBjbGFtcC5vbmFwLm9y
-ZzpERVYxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJV
-UzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMHfScyHSFzMiS9Ymjs
-6aDtwAeHPnQ0GEsHu77rShdEYLJrhKqyyqrE2c2o1BA/0yZ+Vbar9tl6lafxGTbd
-foIuaghSWuPwEw+RQJGrOC+VpY9I0ArlBw6noZS9dO5fgSxpbEmFuz1SPPb6qLXf
-uI06p8DHWxTKBqHWSMAuuoeRcOoka8h/FTkRLRqQGL+UHsDdakTnYpOKhIUlLkpu
-emPWiB98Y0rICI2pTrUtwXUWNaYg1q3bPdkyT/deb4cIOD8Ys+duHgTUqgTXQ7bY
-AzKzpgYTI++BF+tMXXcOwNfnY+aZQduRIHqTBL8J5XlS777xvpPYhak/Jnb7mm2Y
-v60CAwEAAaOB/jCB+zAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAgBgNVHSUB
-Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVAYDVR0jBE0wS4AUgfeZWxC5yIze
-81Je6k5poEM+rN2hMKQuMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQ
-MQswCQYDVQQGEwJVU4IBBzAdBgNVHQ4EFgQUzfIed+18wgFs7E6q0b6BbMICtfsw
-RwYDVR0RBEAwPoIFY2xhbXCCCmNsYW1wLW9uYXCCHWNsYW1wLmFwaS5zaW1wbGVk
-ZW1vLm9uYXAub3JnggpjbGFtcC5vbmFwMA0GCSqGSIb3DQEBCwUAA4IBAQBizhsW
-XrJ9wQy3PrBxgh90sOF15tayXPRZSFYPoQb5LhRh3IY/PvXLaSHlkgPHlCLLx36S
-0/DiVf86/83ABvyaq9gJIyg/m4ntNae23OKH1AkA1aN+JCKA8yhsAzDBcRF6Aj7E
-VJ+vQlSzz5oh+efP1e/8DUMd1/WwbTXvRd0Iqv/fyZunbjb82qNMrsK1mQ2q+87A
-0jx9u1EdeMihP6vWiuKzlwy4mKoNT573SPpvaOkjX3yDlmf2CTQZ9vdAvjmFmVsH
-1wyrNZOIgW4VjluiZfAk3mOEskrZiP/7aUXnxmNnYTpgZMbhiouLbRrTc4lLEyhx
-G7A61/KGTsLZlvxb
+bnRlcm1lZGlhdGVDQV85MB4XDTIwMDkxMDExMTI1NloXDTIxMDkxMDExMTI1Nlow
+XzEOMAwGA1UEAwwFY2xhbXAxITAfBgNVBAsMGGNsYW1wQGNsYW1wLm9uYXAub3Jn
+OkRFVjEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVT
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr5KLITLjuDYZozHqqmHT
+5T8QkxKxXCAu6aai1udDAngrYL6QHDgK/527TyjdFMQrqROmyvi30nFlGIPHvWNc
+qx13E08KISDxCD2Mx3SWIroQIFI/1V33REluPTblj1hToZFEGmuCIUZRdnidViKk
+YBKnnWQsVnnMpMysrA3S9PM9w0XPvMqBmSejmcOAgZskczERe+3rzpo+ing/p2v1
+ayGYryTr5uLAOHqE5rYtqtjQKQoa+WaKvV4xgxmFZI9VwLwKFQdtCmOMQQ8HYmA8
+lu01kTG04vJsPb6W5Zr9p8fiP9frY+kVL1ujUDYfm6RCPs8kDd9SqzzHxOIe8Uqm
+xwIDAQABo4IBIDCCARwwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwIAYDVR0l
+AQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRNMEuAFIH3mVsQuciM
+3vNSXupOaaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05B
+UDELMAkGA1UEBhMCVVOCAQcwHQYDVR0OBBYEFE9V3RSjFsDHLDv0k0TNstAxH5pc
+MGgGA1UdEQRhMF+BH21hcmsuZC5tYW5hZ2VyQHBlb3BsZS5vc2FhZi5jb22CBWNs
+YW1wggpjbGFtcC1vbmFwgh1jbGFtcC5hcGkuc2ltcGxlZGVtby5vbmFwLm9yZ4IK
+Y2xhbXAub25hcDANBgkqhkiG9w0BAQsFAAOCAQEAP3FYxCPd7K/Xxy8NDx2umU46
+/pTgeqRzS9IawQw1dYNxR1D3AmKdrac+++gGqF+7TkGUrDM9vgGF7uyAbo2YKghC
+EL+3UEkkW1SgAN/YxxD/JEXqhs2CVTWfq8Lt8Z38V+JZcHUYJF2ge9taOvWHWcLf
+Qv9IvPpAdmfZexKdlaXwzrePD19YeWwow+THyoc+blWwOzx3huYJlra8W5qpoUBc
+OHyrShhALEMqeJV5GSFaKOdQJ62g5wRb1ixSmf3cD6MgiJ7D1/++y9v8N3lre2h+
+cWTjTy1WnaiC4veYJseI/zar52czbAmB0NvVxNGqB8MPtLyBDXLUgw4ozlAzlg==
 -----END CERTIFICATE-----
diff --git a/src/main/docker/kibana/conf/keystore/org.onap.clamp.key.pem b/src/main/docker/kibana/conf/keystore/org.onap.clamp.key.pem
index bcbb9f1..8c21b94 100644
--- a/src/main/docker/kibana/conf/keystore/org.onap.clamp.key.pem
+++ b/src/main/docker/kibana/conf/keystore/org.onap.clamp.key.pem
@@ -1,32 +1,32 @@
 Bag Attributes
     friendlyName: clamp@clamp.onap.org
-    localKeyID: 54 69 6D 65 20 31 35 38 30 38 32 39 30 36 35 34 37 39 
+    localKeyID: 54 69 6D 65 20 31 35 39 39 37 33 36 33 37 37 31 30 30 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCTB30nMh0hczIk
-vWJo7Omg7cAHhz50NBhLB7u+60oXRGCya4SqssqqxNnNqNQQP9MmflW2q/bZepWn
-8Rk23X6CLmoIUlrj8BMPkUCRqzgvlaWPSNAK5QcOp6GUvXTuX4EsaWxJhbs9Ujz2
-+qi137iNOqfAx1sUygah1kjALrqHkXDqJGvIfxU5ES0akBi/lB7A3WpE52KTioSF
-JS5Kbnpj1ogffGNKyAiNqU61LcF1FjWmINat2z3ZMk/3Xm+HCDg/GLPnbh4E1KoE
-10O22AMys6YGEyPvgRfrTF13DsDX52PmmUHbkSB6kwS/CeV5Uu++8b6T2IWpPyZ2
-+5ptmL+tAgMBAAECggEBAIUplzRUswWEq7mSvPqC9+YE7pLi7rGYLRhnXKdBuszv
-5RQzROjFHcEkoI8fhVFiPP70FPVpMh0uZTTBrDCA0v9cwjPfQuqGmPzUdUJ5bF3M
-jzICpEn5vDaNpE5ueOUcIoXyxVyhfj+/p++YfgybHy7qHN0AsYFWqEMTLLjCmbYF
-pZozbAcGQoAR8PSfwuvgusuEezrhYertHsdFwlfZhDtJvnm/4YKRUVEBzuaaA7B9
-sUhnQFS8ScqiUbkAGdjfY9wOYRHnQgjtqiP8poIzLkqCNSoVctgh5Pdv4jp4HO90
-J5QC+f7m7rOoWUw8EYbRo/4C4Mckh0GQQ+oP4xzrtZECgYEA3DYALFgOEY+0RR1K
-61HAKqdNy1YbeuidpCBEJEwmIbzdgO1DcJdNznbfdRlmS7VB9orwRfNbf7Hxm2w/
-/xn9USENXWx7fvDoISqSDegvEsBSq5hSEMVl3f7CfQZrYl1f6gxfe7L/jtmbn0eQ
-avsr9RaUCWP794DEXKuA9pC8hVsCgYEAquy5I4hO4jNBQ6v5+omjsEgk4513/RNs
-f47Md8bsDHKJMbCMKCdqM1D3J1xbgV3DgSv0yNlKdU2wenWdgQAyBtz18NBgno85
-YNanFhp1CymgLFHdLJHSOqAkzutSuCNnGTT6AKspOQvy+cuj7XsnbsxtYK3Cgw5h
-Mom3RnUy9ZcCgYAnForHVEYDBgAYuI9g39z9dT8Q1dMA6SN6S6Ps0Xt/R5gF15e9
-941/FYiqr3yB+cWgrp7hu8XFD9/0F63waTuW2AgYSjZNnROHN5g/UbRxXqQOA3al
-tXRUiHEbYjVTe4GX+ORF/8rvH19JUZmn87ekxII4fH/wOfIhBOxaV+yuuwKBgHtz
-5Tizz/3y9TWSdkgtt6uwP+yipLKGn/v1wNrWM1G+PDdGg8TQyxTrasfkHjdu6LFY
-dUHIJ85X4ZphbvRolrl8SKq5Zr+/RLsb7qy5SUZZt1Wrfysc25H6bvuA3ksfTuzW
-5acr+Oc6KTGgkvMI229cebe1aONNtIhTDav3JGpbAoGAX5DQvNreqnP8qSAvUN2I
-TAHXIzawR3f6vgGgVIdkHkiS2eKzs/fgP3VAK80TbrGSR8HvBcPEcR/icOn1u/e6
-tDp0j6mGt5aPKK9VQkBn94bW35T12FUbdB+L8FWWTUrfiVWJtEW8tEsKil5ac8U4
-Bn3vC5WUeKhW6v6kD4AigqE=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCvkoshMuO4Nhmj
+MeqqYdPlPxCTErFcIC7ppqLW50MCeCtgvpAcOAr/nbtPKN0UxCupE6bK+LfScWUY
+g8e9Y1yrHXcTTwohIPEIPYzHdJYiuhAgUj/VXfdESW49NuWPWFOhkUQaa4IhRlF2
+eJ1WIqRgEqedZCxWecykzKysDdL08z3DRc+8yoGZJ6OZw4CBmyRzMRF77evOmj6K
+eD+na/VrIZivJOvm4sA4eoTmti2q2NApChr5Zoq9XjGDGYVkj1XAvAoVB20KY4xB
+DwdiYDyW7TWRMbTi8mw9vpblmv2nx+I/1+tj6RUvW6NQNh+bpEI+zyQN31KrPMfE
+4h7xSqbHAgMBAAECggEAHlLKEs7OQ8ecP/JkHE9PIJ32x+AHn+izEYnFQCarDSci
+HtBq5WTMiX99lVtya57CB66sNQwl+4O4OTaxbcVWgPtS0JPrJPOijZDL2rsJHzBR
+jrOF8N0M0s936bysg0h3EUWcpI+C5ypU8Yg9bF4JU8qFBosBmWHp9WCgRgsRL1r1
+bKV1zyq80mbY26nv3FAWhcVvMFX9BvUx0SZCD/hYJq0DRREXlPpxlhOdm3qXYnKQ
+RjVFq+ccCfb+J/e9ryFohg9NfHZZ2B2VJgAXxjWuIGpmqczW70rN5NwYYLiPGulr
+3KOk5OfXUbImH1OVhE3gxZkqx9McKM3j8NgsWK+viQKBgQD3HptEtEzf3pRThr50
+ViOPU6DM2EcoXFKTtBzapp9Oz4wecIOzbfGtm03gB9V8dWsPiCQbVRQr7GcnBzH/
+NOcYKbZsC0kuJL9mJFXhRPSvk7Kochs+n1wZVdKl8ugSW2Olqb834li/taAIyevJ
+JZ6gZpYb17J72NQwu1OGZyAJfQKBgQC14bv4aqh34m8NV9Mklx/bAzP4PqnJMTqZ
+kqnB0UWxgjQ/u6uKtKZJ5n5dpebBsgx2CxhBhVGrqqa/mb0DK3LIPkE5FPExypTx
+w36NwtRTuNR6zBheJsd9GAzvDWkraBAKDxXLTygn2F+rluufOM/Y/w6pg93Q91Fv
+pRFcsuBEkwKBgCLyXRrWNJjkLS2yvHRPSjAWr4LIgyeeBr+ElSAGuDi4+SPE3Zse
+TTMz50trUDGNmVpU8mY7HeMoR14pklR48sVkALw+zFaOM9MKCGsXCVNbG8TefiPY
+/XlHvcZiF5eg/PKMktIgXFSgJsWXaJTFkS011LyTQFZrT3akxycWpl0xAoGAMq/u
+CpTuzjo0aKuJFDFpl0eVPCF6f69QfWv6EyGXIpj+pqROciFWFlI99Ss+28wa3OrK
+n7ffws+UGOFnY3LAUj3HP3kunomuaJHquucI9SwVSwOF5vc3sQz6zcQXAxnFHoiF
+slsk/bW3M8Kjd4QFqJusImG1d371GwANjp/rEDECgYA+MVukCjwwFVl3SbLdrfmJ
+W1ZHWsLWLoj177sdsym/MhaBqnEkBxhwkwH7oUC/xw1Py0I+Gz5SV7h/Rt1OuZ2o
+WvkIqUERHvpbBAGIa6VPGB4CevsihNBU80YGFToZqqBE8e8fxRTAYMFYfy7D/ulm
+rsIRjFAuzkoFCIEifrGazQ==
 -----END PRIVATE KEY-----
diff --git a/src/main/docker/logstash/certs/aafca.pem b/src/main/docker/logstash/certs/aafca.pem
index 70bb844..bf61a81 100644
--- a/src/main/docker/logstash/certs/aafca.pem
+++ b/src/main/docker/logstash/certs/aafca.pem
@@ -1,9 +1,7 @@
 Bag Attributes
     friendlyName: CN=intermediateCA_9,OU=OSAAF,O=ONAP,C=US
-subject=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-
-issuer=OU = OSAAF, O = ONAP, C = US
-
+subject=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_9
+issuer=/OU=OSAAF/O=ONAP/C=US
 -----BEGIN CERTIFICATE-----
 MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
 RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN
diff --git a/src/main/docker/logstash/clamp-cert/ca-certs.pem b/src/main/docker/logstash/clamp-cert/ca-certs.pem
index 70bb844..bf61a81 100644
--- a/src/main/docker/logstash/clamp-cert/ca-certs.pem
+++ b/src/main/docker/logstash/clamp-cert/ca-certs.pem
@@ -1,9 +1,7 @@
 Bag Attributes
     friendlyName: CN=intermediateCA_9,OU=OSAAF,O=ONAP,C=US
-subject=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
-
-issuer=OU = OSAAF, O = ONAP, C = US
-
+subject=/C=US/O=ONAP/OU=OSAAF/CN=intermediateCA_9
+issuer=/OU=OSAAF/O=ONAP/C=US
 -----BEGIN CERTIFICATE-----
 MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
 RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN