Skip to content

Commit 3c41efe

Browse files
fahedouchfahedouch
authored
Merge pull request #3667 from haytok/issue_3486
add fields such as CONTAINER_NAME to journald log entries sent to by containers
2 parents 1dd11e1 + b060ead commit 3c41efe

File tree

12 files changed

+105
-40
lines changed

12 files changed

+105
-40
lines changed

‎cmd/nerdctl/container/container_run_test.go

+36-11
Original file line numberDiff line numberDiff line change
@@ -329,19 +329,44 @@ func TestRunWithJournaldLogDriver(t *testing.T) {
329329
time.Sleep(3 * time.Second)
330330
journalctl, err := exec.LookPath("journalctl")
331331
assert.NilError(t, err)
332+
332333
inspectedContainer := base.InspectContainer(containerName)
333-
found := 0
334-
check := func(log poll.LogT) poll.Result {
335-
res := icmd.RunCmd(icmd.Command(journalctl, "--no-pager", "--since", "2 minutes ago", fmt.Sprintf("SYSLOG_IDENTIFIER=%s", inspectedContainer.ID[:12])))
336-
assert.Equal(t, 0, res.ExitCode, res)
337-
if strings.Contains(res.Stdout(), "bar") && strings.Contains(res.Stdout(), "foo") {
338-
found = 1
339-
return poll.Success()
340-
}
341-
return poll.Continue("reading from journald is not yet finished")
334+
335+
type testCase struct {
336+
name string
337+
filter string
338+
}
339+
testCases := []testCase{
340+
{
341+
name: "filter journald logs using SYSLOG_IDENTIFIER field",
342+
filter: fmt.Sprintf("SYSLOG_IDENTIFIER=%s", inspectedContainer.ID[:12]),
343+
},
344+
{
345+
name: "filter journald logs using CONTAINER_NAME field",
346+
filter: fmt.Sprintf("CONTAINER_NAME=%s", containerName),
347+
},
348+
{
349+
name: "filter journald logs using IMAGE_NAME field",
350+
filter: fmt.Sprintf("IMAGE_NAME=%s", testutil.CommonImage),
351+
},
352+
}
353+
for _, tc := range testCases {
354+
tc := tc
355+
t.Run(tc.name, func(t *testing.T) {
356+
found := 0
357+
check := func(log poll.LogT) poll.Result {
358+
res := icmd.RunCmd(icmd.Command(journalctl, "--no-pager", "--since", "2 minutes ago", tc.filter))
359+
assert.Equal(t, 0, res.ExitCode, res)
360+
if strings.Contains(res.Stdout(), "bar") && strings.Contains(res.Stdout(), "foo") {
361+
found = 1
362+
return poll.Success()
363+
}
364+
return poll.Continue("reading from journald is not yet finished")
365+
}
366+
poll.WaitOn(t, check, poll.WithDelay(100*time.Microsecond), poll.WithTimeout(20*time.Second))
367+
assert.Equal(t, 1, found)
368+
})
342369
}
343-
poll.WaitOn(t, check, poll.WithDelay(100*time.Microsecond), poll.WithTimeout(20*time.Second))
344-
assert.Equal(t, 1, found)
345370
}
346371

347372
func TestRunWithJournaldLogDriverAndLogOpt(t *testing.T) {

‎pkg/cmd/container/create.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
218218
// 1, nerdctl run --name demo -it imagename
219219
// 2, ctrl + c to stop demo container
220220
// 3, nerdctl start/restart demo
221-
logConfig, err := generateLogConfig(dataStore, id, options.LogDriver, options.LogOpt, options.GOptions.Namespace)
221+
logConfig, err := generateLogConfig(dataStore, id, options.LogDriver, options.LogOpt, options.GOptions.Namespace, options.GOptions.Address)
222222
if err != nil {
223223
return nil, generateRemoveStateDirFunc(ctx, id, internalLabels), err
224224
}
@@ -819,12 +819,13 @@ func writeCIDFile(path, id string) error {
819819
}
820820

821821
// generateLogConfig creates a LogConfig for the current container store
822-
func generateLogConfig(dataStore string, id string, logDriver string, logOpt []string, ns string) (logConfig logging.LogConfig, err error) {
822+
func generateLogConfig(dataStore string, id string, logDriver string, logOpt []string, ns, address string) (logConfig logging.LogConfig, err error) {
823823
var u *url.URL
824824
if u, err = url.Parse(logDriver); err == nil && u.Scheme != "" {
825825
logConfig.LogURI = logDriver
826826
} else {
827827
logConfig.Driver = logDriver
828+
logConfig.Address = address
828829
logConfig.Opts, err = parseKVStringsMapFromLogOpt(logOpt, logDriver)
829830
if err != nil {
830831
return logConfig, err
@@ -834,7 +835,7 @@ func generateLogConfig(dataStore string, id string, logDriver string, logOpt []s
834835
logConfigB []byte
835836
lu *url.URL
836837
)
837-
logDriverInst, err = logging.GetDriver(logDriver, logConfig.Opts)
838+
logDriverInst, err = logging.GetDriver(logDriver, logConfig.Opts, logConfig.Address)
838839
if err != nil {
839840
return logConfig, err
840841
}

‎pkg/cmd/system/info.go

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"github.com/containerd/nerdctl/v2/pkg/infoutil"
3838
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
3939
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
40+
"github.com/containerd/nerdctl/v2/pkg/logging"
4041
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
4142
"github.com/containerd/nerdctl/v2/pkg/strutil"
4243
)
@@ -72,6 +73,7 @@ func Info(ctx context.Context, client *containerd.Client, options types.SystemIn
7273
if err != nil {
7374
return err
7475
}
76+
infoCompat.Plugins.Log = logging.Drivers()
7577
default:
7678
return fmt.Errorf("unknown mode %q", options.Mode)
7779
}

‎pkg/infoutil/infoutil.go

-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"github.com/containerd/nerdctl/v2/pkg/buildkitutil"
3636
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
3737
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/native"
38-
"github.com/containerd/nerdctl/v2/pkg/logging"
3938
"github.com/containerd/nerdctl/v2/pkg/version"
4039
)
4140

@@ -82,7 +81,6 @@ func Info(ctx context.Context, client *containerd.Client, snapshotter, cgroupMan
8281
info.ID = daemonIntro.UUID
8382
// Storage drivers and logging drivers are not really Server concept for nerdctl, but mimics `docker info` output
8483
info.Driver = snapshotter
85-
info.Plugins.Log = logging.Drivers()
8684
info.Plugins.Storage = snapshotterPlugins
8785
info.SystemTime = time.Now().Format(time.RFC3339Nano)
8886
info.LoggingDriver = "json-file" // hard-coded

‎pkg/logging/fluentd_logger.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package logging
1818

1919
import (
20+
"context"
2021
"fmt"
2122
"math"
2223
"net/url"
@@ -99,7 +100,7 @@ func (f *FluentdLogger) Init(dataStore, ns, id string) error {
99100
return nil
100101
}
101102

102-
func (f *FluentdLogger) PreProcess(_ string, config *logging.Config) error {
103+
func (f *FluentdLogger) PreProcess(_ context.Context, _ string, config *logging.Config) error {
103104
if runtime.GOOS == "windows" {
104105
// TODO: support fluentd on windows
105106
return fmt.Errorf("logging to fluentd is not supported on windows")

‎pkg/logging/journald_logger.go

+35-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package logging
1818

1919
import (
2020
"bytes"
21+
"context"
2122
"errors"
2223
"fmt"
2324
"io"
@@ -35,6 +36,8 @@ import (
3536
"github.com/containerd/containerd/v2/core/runtime/v2/logging"
3637
"github.com/containerd/log"
3738

39+
"github.com/containerd/nerdctl/v2/pkg/clientutil"
40+
"github.com/containerd/nerdctl/v2/pkg/containerutil"
3841
"github.com/containerd/nerdctl/v2/pkg/strutil"
3942
)
4043

@@ -52,8 +55,9 @@ func JournalLogOptsValidate(logOptMap map[string]string) error {
5255
}
5356

5457
type JournaldLogger struct {
55-
Opts map[string]string
56-
vars map[string]string
58+
Opts map[string]string
59+
vars map[string]string
60+
Address string
5761
}
5862

5963
type identifier struct {
@@ -66,7 +70,7 @@ func (journaldLogger *JournaldLogger) Init(dataStore, ns, id string) error {
6670
return nil
6771
}
6872

69-
func (journaldLogger *JournaldLogger) PreProcess(dataStore string, config *logging.Config) error {
73+
func (journaldLogger *JournaldLogger) PreProcess(ctx context.Context, dataStore string, config *logging.Config) error {
7074
if !journal.Enabled() {
7175
return errors.New("the local systemd journal is not available for logging")
7276
}
@@ -95,9 +99,37 @@ func (journaldLogger *JournaldLogger) PreProcess(dataStore string, config *loggi
9599
syslogIdentifier = b.String()
96100
}
97101
}
102+
103+
client, ctx, cancel, err := clientutil.NewClient(ctx, config.Namespace, journaldLogger.Address)
104+
if err != nil {
105+
return err
106+
}
107+
defer func() {
108+
cancel()
109+
client.Close()
110+
}()
111+
containerID := config.ID
112+
container, err := client.LoadContainer(ctx, containerID)
113+
if err != nil {
114+
return err
115+
}
116+
containerLabels, err := container.Labels(ctx)
117+
if err != nil {
118+
return err
119+
}
120+
containerInfo, err := container.Info(ctx)
121+
if err != nil {
122+
return err
123+
}
124+
98125
// construct log metadata for the container
99126
vars := map[string]string{
100127
"SYSLOG_IDENTIFIER": syslogIdentifier,
128+
"CONTAINER_TAG": syslogIdentifier,
129+
"CONTAINER_ID": shortID,
130+
"CONTAINER_ID_FULL": containerID,
131+
"CONTAINER_NAME": containerutil.GetContainerName(containerLabels),
132+
"IMAGE_NAME": containerInfo.Image,
101133
}
102134
journaldLogger.vars = vars
103135
return nil

‎pkg/logging/json_logger.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (jsonLogger *JSONLogger) Init(dataStore, ns, id string) error {
7878
return nil
7979
}
8080

81-
func (jsonLogger *JSONLogger) PreProcess(dataStore string, config *logging.Config) error {
81+
func (jsonLogger *JSONLogger) PreProcess(ctx context.Context, dataStore string, config *logging.Config) error {
8282
var jsonFilePath string
8383
if logPath, ok := jsonLogger.Opts[LogPath]; ok {
8484
jsonFilePath = logPath

‎pkg/logging/logging.go

+16-15
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ const (
4949

5050
type Driver interface {
5151
Init(dataStore, ns, id string) error
52-
PreProcess(dataStore string, config *logging.Config) error
52+
PreProcess(ctx context.Context, dataStore string, config *logging.Config) error
5353
Process(stdout <-chan string, stderr <-chan string) error
5454
PostProcess() error
5555
}
5656

57-
type DriverFactory func(map[string]string) (Driver, error)
57+
type DriverFactory func(map[string]string, string) (Driver, error)
5858
type LogOptsValidateFunc func(logOptMap map[string]string) error
5959

6060
var drivers = make(map[string]DriverFactory)
@@ -81,28 +81,28 @@ func Drivers() []string {
8181
return ss
8282
}
8383

84-
func GetDriver(name string, opts map[string]string) (Driver, error) {
84+
func GetDriver(name string, opts map[string]string, address string) (Driver, error) {
8585
driverFactory, ok := drivers[name]
8686
if !ok {
8787
return nil, fmt.Errorf("unknown logging driver %q: %w", name, errdefs.ErrNotFound)
8888
}
89-
return driverFactory(opts)
89+
return driverFactory(opts, address)
9090
}
9191

9292
func init() {
93-
RegisterDriver("none", func(opts map[string]string) (Driver, error) {
93+
RegisterDriver("none", func(opts map[string]string, address string) (Driver, error) {
9494
return &NoneLogger{}, nil
9595
}, NoneLogOptsValidate)
96-
RegisterDriver("json-file", func(opts map[string]string) (Driver, error) {
96+
RegisterDriver("json-file", func(opts map[string]string, address string) (Driver, error) {
9797
return &JSONLogger{Opts: opts}, nil
9898
}, JSONFileLogOptsValidate)
99-
RegisterDriver("journald", func(opts map[string]string) (Driver, error) {
100-
return &JournaldLogger{Opts: opts}, nil
99+
RegisterDriver("journald", func(opts map[string]string, address string) (Driver, error) {
100+
return &JournaldLogger{Opts: opts, Address: address}, nil
101101
}, JournalLogOptsValidate)
102-
RegisterDriver("fluentd", func(opts map[string]string) (Driver, error) {
102+
RegisterDriver("fluentd", func(opts map[string]string, address string) (Driver, error) {
103103
return &FluentdLogger{Opts: opts}, nil
104104
}, FluentdLogOptsValidate)
105-
RegisterDriver("syslog", func(opts map[string]string) (Driver, error) {
105+
RegisterDriver("syslog", func(opts map[string]string, address string) (Driver, error) {
106106
return &SyslogLogger{Opts: opts}, nil
107107
}, SyslogOptsValidate)
108108
}
@@ -121,9 +121,10 @@ func Main(argv2 string) error {
121121

122122
// LogConfig is marshalled as "log-config.json"
123123
type LogConfig struct {
124-
Driver string `json:"driver"`
125-
Opts map[string]string `json:"opts,omitempty"`
126-
LogURI string `json:"-"`
124+
Driver string `json:"driver"`
125+
Opts map[string]string `json:"opts,omitempty"`
126+
LogURI string `json:"-"`
127+
Address string `json:"address"`
127128
}
128129

129130
// LogConfigFilePath returns the path of log-config.json
@@ -149,7 +150,7 @@ func LoadLogConfig(dataStore, ns, id string) (LogConfig, error) {
149150
}
150151

151152
func loggingProcessAdapter(ctx context.Context, driver Driver, dataStore string, config *logging.Config) error {
152-
if err := driver.PreProcess(dataStore, config); err != nil {
153+
if err := driver.PreProcess(ctx, dataStore, config); err != nil {
153154
return err
154155
}
155156

@@ -215,7 +216,7 @@ func loggerFunc(dataStore string) (logging.LoggerFunc, error) {
215216
if err != nil {
216217
return err
217218
}
218-
driver, err := GetDriver(logConfig.Driver, logConfig.Opts)
219+
driver, err := GetDriver(logConfig.Driver, logConfig.Opts, logConfig.Address)
219220
if err != nil {
220221
return err
221222
}

‎pkg/logging/logging_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (m *MockDriver) Init(dataStore, ns, id string) error {
3838
return nil
3939
}
4040

41-
func (m *MockDriver) PreProcess(dataStore string, config *logging.Config) error {
41+
func (m *MockDriver) PreProcess(ctx context.Context, dataStore string, config *logging.Config) error {
4242
return nil
4343
}
4444

‎pkg/logging/none_logger.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package logging
1818

1919
import (
20+
"context"
21+
2022
"github.com/containerd/containerd/v2/core/runtime/v2/logging"
2123
)
2224

@@ -28,7 +30,7 @@ func (n *NoneLogger) Init(dataStore, ns, id string) error {
2830
return nil
2931
}
3032

31-
func (n *NoneLogger) PreProcess(dataStore string, config *logging.Config) error {
33+
func (n *NoneLogger) PreProcess(ctx context.Context, dataStore string, config *logging.Config) error {
3234
return nil
3335
}
3436

‎pkg/logging/none_logger_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package logging
1818

1919
import (
20+
"context"
2021
"os"
2122
"testing"
2223
"time"
@@ -29,6 +30,7 @@ import (
2930
func TestNoneLogger(t *testing.T) {
3031
// Create a temporary directory for potential log files
3132
tmpDir := t.TempDir()
33+
ctx := context.Background()
3234

3335
logger := &NoneLogger{
3436
Opts: map[string]string{},
@@ -40,7 +42,7 @@ func TestNoneLogger(t *testing.T) {
4042

4143
// Run all logger methods
4244
logger.Init(tmpDir, "namespace", "id")
43-
logger.PreProcess(tmpDir, &logging.Config{})
45+
logger.PreProcess(ctx, tmpDir, &logging.Config{})
4446

4547
stdout := make(chan string)
4648
stderr := make(chan string)

‎pkg/logging/syslog_logger.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package logging
1818

1919
import (
20+
"context"
2021
"crypto/tls"
2122
"errors"
2223
"fmt"
@@ -122,7 +123,7 @@ func (sy *SyslogLogger) Init(dataStore string, ns string, id string) error {
122123
return nil
123124
}
124125

125-
func (sy *SyslogLogger) PreProcess(dataStore string, config *logging.Config) error {
126+
func (sy *SyslogLogger) PreProcess(ctx context.Context, dataStore string, config *logging.Config) error {
126127
logger, err := parseSyslog(config.ID, sy.Opts)
127128
if err != nil {
128129
return err

0 commit comments

Comments
 (0)