Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update default filebeat image #775

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Update default filebeat image #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions controllers/spec/common.go
View file
Open in desktop
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 != "" {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for java runtime, we should always get the log level and pass it as the argument: -Dpulsar.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
View file
Open in desktop
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
Loading