Skip to content

Commit

Permalink
Update default filebeat image (#775)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangpengcheng authored Aug 2, 2024
1 parent d7b77a5 commit ee53ec4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 2 additions & 4 deletions controllers/spec/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ package spec
import (
"bytes"
"context"

// used for template
_ "embed"
"encoding/json"
"errors"
Expand Down Expand Up @@ -125,7 +123,7 @@ const (
DefaultPythonLogConfigPath = PythonLogConifgDirectory + PythonLogConfigFile

DefaultFilebeatConfig = "/usr/share/filebeat/config/filebeat.yaml"
DefaultFilebeatImage = "streamnative/filebeat:v0.6.0-rc7"
DefaultFilebeatImage = "streamnative/filebeat:v0.6.0"

EnvGoFunctionLogLevel = "LOGGING_LEVEL"

Expand Down Expand Up @@ -1114,7 +1112,7 @@ func parseJavaLogLevel(runtime *v1alpha1.JavaRuntime) string {
v1alpha1.LogLevelFatal: "FATAL",
v1alpha1.LogLevelOff: "OFF",
}
if runtime.Log != nil && runtime.Log.Level != "" && runtime.Log.LogConfig == nil {
if runtime.Log != nil && runtime.Log.Level != "" {
if level, exist := levelMap[runtime.Log.Level]; exist {
return level
}
Expand Down
1 change: 1 addition & 0 deletions controllers/spec/template/filebeat-config.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ filebeat.inputs:
paths:
- /pulsar/logs/functions/*.log
output.pulsar:
fast_fail: true
url: \${brokerServiceURL}
topic: \${logTopic}
name: \${logName}
Expand Down

0 comments on commit ee53ec4

Please sign in to comment.