Skip to content

Commit 1e9470e

Browse files
committed
Use WebLogic Monitoring Exporter 2.1.5
1 parent 9e41c19 commit 1e9470e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

documentation/domains/Domain.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@
577577
"type": "object",
578578
"properties": {
579579
"image": {
580-
"description": "The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-1.1",
580+
"description": "The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2",
581581
"type": "string"
582582
},
583583
"imagePullPolicy": {
@@ -724,7 +724,7 @@
724724
"type": "object",
725725
"properties": {
726726
"image": {
727-
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3",
727+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.5",
728728
"type": "string"
729729
},
730730
"imagePullPolicy": {

documentation/domains/Domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
121121
| `elasticSearchCredentials` | string | Fluentd elastic search credentials. A Kubernetes secret in the same namespace of the domain. It must contains 4 keys: elasticsearchhost - ElasticSearch Host Service Address, elasticsearchport - Elastic Search Service Port, elasticsearchuser - Elastic Search Service User Name, elasticsearchpassword - Elastic Search User Password |
122122
| `env` | Array of [Env Var](k8s1.13.5.md#env-var) | A list of environment variables to set in the fluentd container. See `kubectl explain pods.spec.containers.env`. |
123123
| `fluentdConfiguration` | string | The fluentd configuration text, specify your own custom fluentd configuration. |
124-
| `image` | string | The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-1.1 |
124+
| `image` | string | The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2 |
125125
| `imagePullPolicy` | string | The image pull policy for the Fluentd sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise. |
126126
| `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Memory and CPU minimum requirements and limits for the fluentd container. See `kubectl explain pods.spec.containers.resources`. |
127127
| `volumeMounts` | Array of [Volume Mount](k8s1.13.5.md#volume-mount) | Volume mounts for fluentd container |
@@ -143,7 +143,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
143143
| Name | Type | Description |
144144
| --- | --- | --- |
145145
| `configuration` | Map | The configuration for the WebLogic Monitoring Exporter. If WebLogic Server instances are already running and have the monitoring exporter sidecar container, then changes to this field will be propagated to the exporter without requiring the restart of the WebLogic Server instances. |
146-
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3 |
146+
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.5 |
147147
| `imagePullPolicy` | string | The image pull policy for the WebLogic Monitoring Exporter sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise. |
148148
| `port` | number | The port exposed by the WebLogic Monitoring Exporter running in the sidecar container. Defaults to 8080. The port value must not conflict with a port used by any WebLogic Server instance, including the ports of built-in channels or network access points (NAPs). |
149149
| `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Memory and CPU minimum requirements and limits for the Monitoring Exporter sidecar. See `kubectl explain pods.spec.containers.resources`. |

kubernetes/crd/domain-crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 3a51e19dfa34958e8f7f4580691c8b0b98cf6873d7bbe4a666a808194434a63e
8+
weblogic.sha256: 4562dd87946c66124c855193d41b885fceb8d17e97b5679bd05d2ddbd5a9ff1e
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -39,7 +39,7 @@ spec:
3939
properties:
4040
image:
4141
description: The WebLogic Monitoring Exporter sidecar container
42-
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3
42+
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.5
4343
type: string
4444
imagePullPolicy:
4545
description: The image pull policy for the WebLogic Monitoring
@@ -293,7 +293,7 @@ spec:
293293
pod will have the fluentd sidecar or not, as appropriate
294294
properties:
295295
image:
296-
description: The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-1.1
296+
description: The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2
297297
type: string
298298
imagePullPolicy:
299299
description: The image pull policy for the Fluentd sidecar container

operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
/** Kubernetes constants. */
99
public interface KubernetesConstants {
1010
String DEFAULT_IMAGE = "container-registry.oracle.com/middleware/weblogic:12.2.1.4";
11-
String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3";
12-
String DEFAULT_FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-1.1";
11+
String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.5";
12+
String DEFAULT_FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2";
1313
String EXPORTER_CONTAINER_NAME = "monitoring-exporter";
1414
String ALWAYS_IMAGEPULLPOLICY = ImagePullPolicy.Always.name();
1515
String IFNOTPRESENT_IMAGEPULLPOLICY = ImagePullPolicy.IfNotPresent.name();

0 commit comments

Comments
 (0)