summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-04-01 06:40:08 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-01 06:40:08 +0000
commit4ed91fa5683aa34c2f6769d63ca28b7986eb9c12 (patch)
tree6371aaae25d3397cd790769761a907a19bf8b9d8 /kubernetes
parent94b5be41218a2d6be673dffd5fef938bfd995970 (diff)
parentf2f035e7c581dd8355bcedac04c7b8613cfa004e (diff)
Merge "[OOF] CMSO logs to STDOUT"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/logback.xml6
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/values.yaml4
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/logback.xml6
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/values.yaml6
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/logback.xml6
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/values.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/logback.xml6
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/values.yaml2
12 files changed, 27 insertions, 19 deletions
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/logback.xml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/logback.xml
index e4386fd249..e288419211 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/logback.xml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/logback.xml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
-<included>
+<configuration>
<jmxConfigurator />
<!-- Example evaluator filter applied against console appender -->
<property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
@@ -245,9 +245,9 @@
</logger>
<!-- logback jms appenders & loggers definition ends here -->
- <root level="DEBUG">
+ <root level="INFO">
<appender-ref ref="DEBUG" />
<appender-ref ref="STDOUT" />
</root>
-</included>
+</configuration>
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml
index 1f96183dd5..08af62d844 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml
@@ -120,6 +120,8 @@ spec:
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-aaf-creds" "key" "login") | indent 10}}
- name: AAF_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-aaf-creds" "key" "password") | indent 10}}
+ - name: VM_ARGS
+ value: "-Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/share/etc/config"
command:
- /bin/sh
args:
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/values.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/values.yaml
index d50995a615..b16dc9f67b 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/values.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/values.yaml
@@ -24,12 +24,12 @@ subChartsOnly:
enabled: true
# application image
-image: onap/optf-cmso-optimizer:2.3.2
+image: onap/optf-cmso-optimizer:2.3.3
pullPolicy: Always
#init container image
dbinit:
- image: onap/optf-cmso-dbinit:2.3.2
+ image: onap/optf-cmso-dbinit:2.3.3
# flag to enable debugging - application support required
debugEnabled: false
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/logback.xml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/logback.xml
index e4386fd249..e288419211 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/logback.xml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/logback.xml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
-<included>
+<configuration>
<jmxConfigurator />
<!-- Example evaluator filter applied against console appender -->
<property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
@@ -245,9 +245,9 @@
</logger>
<!-- logback jms appenders & loggers definition ends here -->
- <root level="DEBUG">
+ <root level="INFO">
<appender-ref ref="DEBUG" />
<appender-ref ref="STDOUT" />
</root>
-</included>
+</configuration>
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
index d9f2bd0734..4a02a64a56 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
@@ -144,6 +144,8 @@ spec:
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-aaf-creds" "key" "login") | indent 10}}
- name: AAF_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cmso-aaf-creds" "key" "password") | indent 10}}
+ - name: VM_ARGS
+ value: "-Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/share/etc/config"
command:
- /bin/sh
args:
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/values.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/values.yaml
index 06dd478b0e..1cb63036d9 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/values.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/values.yaml
@@ -23,13 +23,13 @@ subChartsOnly:
enabled: true
# application image
-image: onap/optf-cmso-service:2.3.2
-robotimage: onap/optf-cmso-robot:2.3.2
+image: onap/optf-cmso-service:2.3.3
+robotimage: onap/optf-cmso-robot:2.3.3
pullPolicy: Always
#init container image
dbinit:
- image: onap/optf-cmso-dbinit:2.3.2
+ image: onap/optf-cmso-dbinit:2.3.3
# flag to enable debugging - application support required
debugEnabled: false
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/logback.xml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/logback.xml
index e4386fd249..e288419211 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/logback.xml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/logback.xml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
-<included>
+<configuration>
<jmxConfigurator />
<!-- Example evaluator filter applied against console appender -->
<property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
@@ -245,9 +245,9 @@
</logger>
<!-- logback jms appenders & loggers definition ends here -->
- <root level="DEBUG">
+ <root level="INFO">
<appender-ref ref="DEBUG" />
<appender-ref ref="STDOUT" />
</root>
-</included>
+</configuration>
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml
index 9f9484ff94..45c7fc475f 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml
@@ -57,6 +57,8 @@ spec:
value: {{ .Values.global.truststorePassword }}
- name: AUTHENTICATION
value: proprietary-auth
+ - name: VM_ARGS
+ value: "-Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/share/etc/config"
command:
- /bin/sh
args:
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/values.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/values.yaml
index 4f6976ed28..6e312aa0cb 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/values.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/values.yaml
@@ -23,7 +23,7 @@ subChartsOnly:
enabled: true
# application image
-image: onap/optf-cmso-ticketmgt:2.3.2
+image: onap/optf-cmso-ticketmgt:2.3.3
pullPolicy: Always
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/logback.xml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/logback.xml
index e4386fd249..e288419211 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/logback.xml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/logback.xml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
-<included>
+<configuration>
<jmxConfigurator />
<!-- Example evaluator filter applied against console appender -->
<property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
@@ -245,9 +245,9 @@
</logger>
<!-- logback jms appenders & loggers definition ends here -->
- <root level="DEBUG">
+ <root level="INFO">
<appender-ref ref="DEBUG" />
<appender-ref ref="STDOUT" />
</root>
-</included>
+</configuration>
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml
index c08d9a3451..cd9814a776 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml
@@ -57,6 +57,8 @@ spec:
value: {{ .Values.global.truststorePassword }}
- name: AUTHENTICATION
value: {{ .Values.global.authentication }}
+ - name: VM_ARGS
+ value: "-Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/share/etc/config"
command:
- /bin/sh
args:
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/values.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/values.yaml
index b3adb5c69c..217db26612 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/values.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/values.yaml
@@ -22,7 +22,7 @@ subChartsOnly:
enabled: true
# application image
-image: onap/optf-cmso-topology:2.3.2
+image: onap/optf-cmso-topology:2.3.3
pullPolicy: Always