Skip to content

Commit 2f58b73

Browse files
rjeberhardrjeberhard
authored
Add logging max size and count for rotation (#2229)
* Add logging max size and count for rotation * Review comments * Fix constant
1 parent b05b3fc commit 2f58b73

File tree

7 files changed

+44
-26
lines changed

7 files changed

+44
-26
lines changed

‎docs/charts/index.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ entries:
33
weblogic-operator:
44
- apiVersion: v1
55
appVersion: 3.2.0
6-
created: "2021-02-23T09:10:09.881083-05:00"
6+
created: "2021-02-25T14:46:05.542187-05:00"
77
description: Helm chart for configuring the WebLogic operator.
8-
digest: 9107dcfa259abc0f615a63529ac4e4aa0216d5d356baf16b4bc551e0a72fab3c
8+
digest: 398c4b215350f28ac20a74475acdbaef603e2c899d5f244d898e1d148db6f35e
99
name: weblogic-operator
1010
type: application
1111
urls:
1212
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.2.0.tgz
1313
version: 3.2.0
1414
- apiVersion: v1
1515
appVersion: 3.1.3
16-
created: "2021-02-23T09:10:09.880353-05:00"
16+
created: "2021-02-25T14:46:05.539704-05:00"
1717
description: Helm chart for configuring the WebLogic operator.
1818
digest: e306bd590dbe84400c6b5bb7a64325330e597223dff63792bb5811c9cfae10ac
1919
name: weblogic-operator
@@ -23,7 +23,7 @@ entries:
2323
version: 3.1.3
2424
- apiVersion: v1
2525
appVersion: 3.1.2
26-
created: "2021-02-23T09:10:09.87918-05:00"
26+
created: "2021-02-25T14:46:05.538076-05:00"
2727
description: Helm chart for configuring the WebLogic operator.
2828
digest: 2d8b77038ba870cc66ddd45e07a593a5ac3159c8b9531b5309688028b5268a5f
2929
name: weblogic-operator
@@ -33,7 +33,7 @@ entries:
3333
version: 3.1.2
3434
- apiVersion: v1
3535
appVersion: 3.1.1
36-
created: "2021-02-23T09:10:09.878279-05:00"
36+
created: "2021-02-25T14:46:05.536707-05:00"
3737
description: Helm chart for configuring the WebLogic operator.
3838
digest: d839cb7bbce4421a59cd9c3df64b1df8649eeebcb6c6b7be34fec25ad00aa141
3939
name: weblogic-operator
@@ -43,7 +43,7 @@ entries:
4343
version: 3.1.1
4444
- apiVersion: v1
4545
appVersion: 3.1.0
46-
created: "2021-02-23T09:10:09.87555-05:00"
46+
created: "2021-02-25T14:46:05.535579-05:00"
4747
description: Helm chart for configuring the WebLogic operator.
4848
digest: 9e105bec11bab249973370a4d5e653f9104cd9fbaaa0c2090fb173805fb3a692
4949
name: weblogic-operator
@@ -52,123 +52,123 @@ entries:
5252
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.1.0.tgz
5353
version: 3.1.0
5454
- apiVersion: v1
55-
created: "2021-02-23T09:10:09.874384-05:00"
55+
created: "2021-02-25T14:46:05.534523-05:00"
5656
description: Helm chart for configuring the WebLogic operator.
5757
digest: 557d0df9958bbdd2f456134d8aff9edf33900bb65774fb0baf2054abd49fdc97
5858
name: weblogic-operator
5959
urls:
6060
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.4.tgz
6161
version: 3.0.4
6262
- apiVersion: v1
63-
created: "2021-02-23T09:10:09.873665-05:00"
63+
created: "2021-02-25T14:46:05.533712-05:00"
6464
description: Helm chart for configuring the WebLogic operator.
6565
digest: 83a0ac84a033ddd9939d4bc5884cc60b22225d7326c43ce8e54a6f403b453814
6666
name: weblogic-operator
6767
urls:
6868
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.3.tgz
6969
version: 3.0.3
7070
- apiVersion: v1
71-
created: "2021-02-23T09:10:09.872927-05:00"
71+
created: "2021-02-25T14:46:05.532509-05:00"
7272
description: Helm chart for configuring the WebLogic operator.
7373
digest: fa3af5d21f858ff93cc7d58664a6eb0a920207af09e4c669a7ffb12e9e15b88d
7474
name: weblogic-operator
7575
urls:
7676
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.2.tgz
7777
version: 3.0.2
7878
- apiVersion: v1
79-
created: "2021-02-23T09:10:09.87219-05:00"
79+
created: "2021-02-25T14:46:05.531682-05:00"
8080
description: Helm chart for configuring the WebLogic operator.
8181
digest: aa2b2afe75305bd69f6b07d61e64a37d3bfd249074c81f6a999cef6b4a217fd0
8282
name: weblogic-operator
8383
urls:
8484
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.1.tgz
8585
version: 3.0.1
8686
- apiVersion: v1
87-
created: "2021-02-23T09:10:09.871333-05:00"
87+
created: "2021-02-25T14:46:05.530712-05:00"
8888
description: Helm chart for configuring the WebLogic operator.
8989
digest: 6540a3a7c6a1c34fcf2ff66679947a1964a35e61232b2a8dea3da087a2d5411d
9090
name: weblogic-operator
9191
urls:
9292
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0.tgz
9393
version: 3.0.0
9494
- apiVersion: v1
95-
created: "2021-02-23T09:10:09.870633-05:00"
95+
created: "2021-02-25T14:46:05.5299-05:00"
9696
description: Helm chart for configuring the WebLogic operator.
9797
digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
9898
name: weblogic-operator
9999
urls:
100100
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
101101
version: 3.0.0-rc1
102102
- apiVersion: v1
103-
created: "2021-02-23T09:10:09.869589-05:00"
103+
created: "2021-02-25T14:46:05.528848-05:00"
104104
description: Helm chart for configuring the WebLogic operator.
105105
digest: e3596b2380b264a0a70ba438858ca9af102a79689bf2e21e237eb63ea2997d66
106106
name: weblogic-operator
107107
urls:
108108
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
109109
version: 2.6.0
110110
- apiVersion: v1
111-
created: "2021-02-23T09:10:09.868503-05:00"
111+
created: "2021-02-25T14:46:05.527672-05:00"
112112
description: Helm chart for configuring the WebLogic operator.
113113
digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
114114
name: weblogic-operator
115115
urls:
116116
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
117117
version: 2.5.0
118118
- apiVersion: v1
119-
created: "2021-02-23T09:10:09.867664-05:00"
119+
created: "2021-02-25T14:46:05.526784-05:00"
120120
description: Helm chart for configuring the WebLogic operator.
121121
digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
122122
name: weblogic-operator
123123
urls:
124124
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
125125
version: 2.4.0
126126
- apiVersion: v1
127-
created: "2021-02-23T09:10:09.866564-05:00"
127+
created: "2021-02-25T14:46:05.525648-05:00"
128128
description: Helm chart for configuring the WebLogic operator.
129129
digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
130130
name: weblogic-operator
131131
urls:
132132
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
133133
version: 2.3.1
134134
- apiVersion: v1
135-
created: "2021-02-23T09:10:09.863446-05:00"
135+
created: "2021-02-25T14:46:05.521184-05:00"
136136
description: Helm chart for configuring the WebLogic operator.
137137
digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
138138
name: weblogic-operator
139139
urls:
140140
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
141141
version: 2.3.0
142142
- apiVersion: v1
143-
created: "2021-02-23T09:10:09.862171-05:00"
143+
created: "2021-02-25T14:46:05.520208-05:00"
144144
description: Helm chart for configuring the WebLogic operator.
145145
digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
146146
name: weblogic-operator
147147
urls:
148148
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
149149
version: 2.2.1
150150
- apiVersion: v1
151-
created: "2021-02-23T09:10:09.856003-05:00"
151+
created: "2021-02-25T14:46:05.519086-05:00"
152152
description: Helm chart for configuring the WebLogic operator.
153153
digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
154154
name: weblogic-operator
155155
urls:
156156
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
157157
version: 2.2.0
158158
- apiVersion: v1
159-
created: "2021-02-23T09:10:09.850986-05:00"
159+
created: "2021-02-25T14:46:05.518174-05:00"
160160
description: Helm chart for configuring the WebLogic operator.
161161
digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
162162
name: weblogic-operator
163163
urls:
164164
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
165165
version: "2.1"
166166
- apiVersion: v1
167-
created: "2021-02-23T09:10:09.845295-05:00"
167+
created: "2021-02-25T14:46:05.517295-05:00"
168168
description: Helm chart for configuring the WebLogic operator.
169169
digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
170170
name: weblogic-operator
171171
urls:
172172
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
173173
version: 2.0.1
174-
generated: "2021-02-23T09:10:09.843742-05:00"
174+
generated: "2021-02-25T14:46:05.515789-05:00"

‎docs/charts/weblogic-operator-3.2.0.tgz

149 Bytes
Binary file not shown.

‎kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ spec:
5353
value: "false"
5454
- name: "JAVA_LOGGING_LEVEL"
5555
value: {{ .javaLoggingLevel | quote }}
56+
- name: "JAVA_LOGGING_MAXSIZE"
57+
value: {{ .javaLoggingFileSizeLimit | default 20000000 | quote }}
58+
- name: "JAVA_LOGGING_COUNT"
59+
value: {{ .javaLoggingFileCount | default 10 | quote }}
5660
- name: ISTIO_ENABLED
5761
value: {{ .istioEnabled | quote }}
5862
{{- if .remoteDebugNodePortEnabled }}

‎kubernetes/charts/weblogic-operator/values.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,19 @@ elasticSearchHost: "elasticsearch.default.svc.cluster.local"
117117
# This parameter is ignored if 'elkIntegrationEnabled' is false.
118118
elasticSearchPort: 9200
119119

120-
# javaLoggingLevel specifies the Java logging level for the operator.
120+
# javaLoggingLevel specifies the Java logging level for the operator. This affects the operator pod's
121+
# log output and the contents of log files in the container's /logs/ directory.
121122
# Valid values are: "SEVERE", "WARNING", "INFO", "CONFIG", "FINE", "FINER", and "FINEST".
122123
javaLoggingLevel: "INFO"
123124

125+
# javaLoggingFileSizeLimit specifies the maximum size in bytes of the Java logging files in the operator container's
126+
# /logs/ directory.
127+
javaLoggingFileSizeLimit: 20000000
128+
129+
# javaLoggingFileCount specifies the number of Java logging files to preserve in the operator container's /logs/
130+
# directory as the files are rotated.
131+
javaLoggingFileCount: 10
132+
124133
# nodeSelector specifies a matching rule that the Kubernetes scheduler will use when selecting the node
125134
# where the operator will run. If the nodeSelector value is specified, then this content will be added to
126135
# the operator's deployment. See https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector

‎operator/scripts/logstash.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
input {
22
file {
3-
path => "/logs/operator.log"
3+
path => "/logs/operator*.log"
44
start_position => "beginning"
55
type => "weblogic-operator"
66
}

‎operator/scripts/logstash.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ java.util.logging.ConsoleHandler.level=INFO
55
java.util.logging.ConsoleHandler.formatter=oracle.kubernetes.operator.logging.LoggingFormatter
66
java.util.logging.FileHandler.level=INFO
77
java.util.logging.FileHandler.formatter=oracle.kubernetes.operator.logging.LoggingFormatter
8-
java.util.logging.FileHandler.pattern=/logs/operator.log
8+
java.util.logging.FileHandler.pattern=/logs/operator%g.log
9+
java.util.logging.FileHandler.limit=JAVA_LOGGING_MAXSIZE
10+
java.util.logging.FileHandler.count=JAVA_LOGGING_COUNT

‎operator/scripts/operator.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ if [[ ! -z "$JAVA_LOGGING_LEVEL" ]]; then
5454
fi
5555
fi
5656

57+
sed -i -e "s|JAVA_LOGGING_MAXSIZE|${JAVA_LOGGING_MAXSIZE:-20000000}|g" $LOGGING_CONFIG
58+
sed -i -e "s|JAVA_LOGGING_COUNT|${JAVA_LOGGING_COUNT:-10}|g" $LOGGING_CONFIG
59+
5760
if [ "${MOCK_WLS}" == 'true' ]; then
5861
MOCKING_WLS="-DmockWLS=true"
5962
fi
@@ -64,7 +67,7 @@ cp /operator/logstash.conf /logs/logstash.conf
6467
# assumption is that we have mounted a volume on /logs which is also visible to
6568
# the logstash container/pod.
6669

67-
# Container memory optimizaton flags
70+
# Container memory optimization flags
6871
HEAP="-XshowSettings:vm"
6972

7073
# Start operator

0 commit comments

Comments
 (0)