Skip to content

Commit 0226a74

Browse files
committed
Dependency updates including monitoring exporter and logstash
1 parent dfa7849 commit 0226a74

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ pipeline {
177177
)
178178
string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
179179
description: '',
180-
defaultValue: '2.0.4'
180+
defaultValue: '2.0.5'
181181
)
182182
booleanParam(name: 'COLLECT_LOGS_ON_SUCCESS',
183183
description: 'Collect logs for successful runs. Default is false.',

documentation/3.4/content/samples/elastic-stack/operator/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You are responsible for configuring Kibana and Elasticsearch, then configuring t
1414
As part of the Elastic Stack integration, Logstash configuration occurs for each deployed operator instance. You can use the following configuration values to configure the integration:
1515

1616
* Set `elkIntegrationEnabled` is `true` to enable the integration.
17-
* Set `logStashImage` to override the default version of Logstash to be used (`logstash:6.6.0`).
17+
* Set `logStashImage` to override the default version of Logstash to be used (`logstash:6.8.23`).
1818
* Set `elasticSearchHost` and `elasticSearchPort` to override the default location where Elasticsearch is running (`elasticsearch2.default.svc.cluster.local:9201`). This will configure Logstash to send the operator's log contents there.
1919
* Set `createLogStashConfigMap` to `true` to use the default Logstash configuration, or set it to `false` and create a ConfigMap named `weblogic-operator-logstash-cm` in the operator's namespace with your own Logstash pipeline configuration.
2020

documentation/3.4/content/userguide/managing-operators/namespace-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ image: ghcr.io/oracle/weblogic-kubernetes-operator:{{< latestVersion >}}
143143
imagePullPolicy: IfNotPresent
144144
internalDebugHttpPort: 30999
145145
javaLoggingLevel: INFO
146-
logStashImage: logstash:6.6.0
146+
logStashImage: logstash:6.8.23
147147
remoteDebugNodePortEnabled: false
148148
serviceAccount: default
149149
suspendOnDebugStartup: false

documentation/3.4/content/userguide/managing-operators/using-helm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,11 +459,11 @@ elkIntegrationEnabled: true
459459
##### `logStashImage`
460460
Specifies the container image containing Logstash. This parameter is ignored if `elkIntegrationEnabled` is `false`.
461461

462-
Defaults to `logstash:6.6.0`.
462+
Defaults to `logstash:6.8.23`.
463463

464464
Example:
465465
```yaml
466-
logStashImage: "docker.elastic.co/logstash/logstash:6.2.0"
466+
logStashImage: "docker.elastic.co/logstash/logstash:6.8.23"
467467
```
468468

469469
##### `elasticSearchHost`

documentation/domains/Domain.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
"type": "object",
673673
"properties": {
674674
"image": {
675-
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.4",
675+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.5",
676676
"type": "string"
677677
},
678678
"imagePullPolicy": {

documentation/domains/Domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
129129
| Name | Type | Description |
130130
| --- | --- | --- |
131131
| `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. |
132-
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.4 |
132+
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.5 |
133133
| `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. |
134134
| `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). |
135135

documentation/domains/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@
15931593
"type": "object",
15941594
"properties": {
15951595
"image": {
1596-
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.4",
1596+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.5",
15971597
"type": "string"
15981598
},
15991599
"imagePullPolicy": {

kubernetes/charts/weblogic-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ elkIntegrationEnabled: false
104104

105105
# logStashImage specifies the container image containing logstash.
106106
# This parameter is ignored if 'elkIntegrationEnabled' is false.
107-
logStashImage: "logstash:6.6.0"
107+
logStashImage: "logstash:6.8.23"
108108

109109
# elasticSearchHost specifies the hostname of where elasticsearch is running.
110110
# This parameter is ignored if 'elkIntegrationEnabled' is false.

kubernetes/crd/domain-crd.yaml

Lines changed: 2 additions & 2 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: 25eec1153c69dece42d0b41281f91d227e2f65ada31579d4d2bb9a3e7d4e99a0
8+
weblogic.sha256: a24058c2814b6d771c8534e09bb193024db187fe9988134d6436b8d1dfb5bedf
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.0.4
42+
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.5
4343
type: string
4444
imagePullPolicy:
4545
description: The image pull policy for the WebLogic Monitoring

operator/integration-tests/kubernetes/logstash.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
containers:
2222
- name: logstash
23-
image: logstash:6.6.0
23+
image: logstash:6.8.23
2424
args: ["-f", "/logs/logstash.conf"]
2525
volumeMounts:
2626
- mountPath: /logs

0 commit comments

Comments
 (0)