p17860254
/
categraf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reorganize log pkg

This commit is contained in:
kongfei 2022-06-02 19:55:13 +08:00
parent a93a696bd0
commit 687c344c7b
75 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
agent/logs_agent.go
View File

@ -15,18 +15,18 @@ import (
coreconfig "flashcat.cloud/categraf/config"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/auditor"
"flashcat.cloud/categraf/pkg/logs/client"
"flashcat.cloud/categraf/pkg/logs/client/http"
"flashcat.cloud/categraf/pkg/logs/diagnostic"
"flashcat.cloud/categraf/pkg/logs/input/file"
"flashcat.cloud/categraf/pkg/logs/input/journald"
"flashcat.cloud/categraf/pkg/logs/input/listener"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/pkg/logs/restart"
"flashcat.cloud/categraf/pkg/logs/service"
logService "flashcat.cloud/categraf/pkg/logs/service"
"flashcat.cloud/categraf/pkg/logs/status"
"flashcat.cloud/categraf/logs/auditor"
"flashcat.cloud/categraf/logs/client"
"flashcat.cloud/categraf/logs/client/http"
"flashcat.cloud/categraf/logs/diagnostic"
"flashcat.cloud/categraf/logs/input/file"
"flashcat.cloud/categraf/logs/input/journald"
"flashcat.cloud/categraf/logs/input/listener"
"flashcat.cloud/categraf/logs/pipeline"
"flashcat.cloud/categraf/logs/restart"
"flashcat.cloud/categraf/logs/service"
logService "flashcat.cloud/categraf/logs/service"
"flashcat.cloud/categraf/logs/status"
)
// LogAgent represents the data pipeline that collects, decodes,

0
pkg/logs/README.md → logs/README.md
View File

0
pkg/logs/auditor/api.go → logs/auditor/api.go
View File

2
pkg/logs/auditor/auditor.go → logs/auditor/auditor.go
View File

@ -15,7 +15,7 @@ import (
"time"
config "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// DefaultRegistryFilename is the default registry filename

2
pkg/logs/auditor/null_auditor.go → logs/auditor/null_auditor.go
View File

@ -1,7 +1,7 @@
package auditor
import (
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// NullAuditor is an auditor not doing anything with the message it received.

0
pkg/logs/client/destination.go → logs/client/destination.go
View File

0
pkg/logs/client/destinations.go → logs/client/destinations.go
View File

0
pkg/logs/client/destinations_context.go → logs/client/destinations_context.go
View File

0
pkg/logs/client/errors.go → logs/client/errors.go
View File

0
pkg/logs/client/http/content_encoding.go → logs/client/http/content_encoding.go
View File

2
pkg/logs/client/http/destination.go → logs/client/http/destination.go
View File

@ -13,7 +13,7 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/client"
"flashcat.cloud/categraf/logs/client"
"flashcat.cloud/categraf/pkg/util/backoff"
httputils "flashcat.cloud/categraf/pkg/util/http"
)

2
pkg/logs/client/tcp/connection_manager.go → logs/client/tcp/connection_manager.go
View File

@ -21,7 +21,7 @@ import (
"golang.org/x/net/proxy"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/status"
"flashcat.cloud/categraf/logs/status"
)
const (

0
pkg/logs/client/tcp/delimiter.go → logs/client/tcp/delimiter.go
View File

2
pkg/logs/client/tcp/destination.go → logs/client/tcp/destination.go
View File

@ -11,7 +11,7 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/client"
"flashcat.cloud/categraf/logs/client"
)
const (

0
pkg/logs/client/tcp/prefixer.go → logs/client/tcp/prefixer.go
View File

0
pkg/logs/decoder/auto_multiline_handler.go → logs/decoder/auto_multiline_handler.go
View File

2
pkg/logs/decoder/decoder.go → logs/decoder/decoder.go
View File

@ -13,7 +13,7 @@ import (
"time"
config "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/parser"
"flashcat.cloud/categraf/logs/parser"
)
// defaultContentLenLimit represents the max size for a line,

0
pkg/logs/decoder/line_handler.go → logs/decoder/line_handler.go
View File

2
pkg/logs/decoder/line_parser.go → logs/decoder/line_parser.go
View File

@ -10,7 +10,7 @@ import (
"log"
"time"
"flashcat.cloud/categraf/pkg/logs/parser"
"flashcat.cloud/categraf/logs/parser"
)
// LineParser e

0
pkg/logs/decoder/matcher.go → logs/decoder/matcher.go
View File

0
pkg/logs/decoder/multiline_handler.go → logs/decoder/multiline_handler.go
View File

0
pkg/logs/decoder/single_line_handler.go → logs/decoder/single_line_handler.go
View File

2
pkg/logs/diagnostic/message_receiver.go → logs/diagnostic/message_receiver.go
View File

@ -12,7 +12,7 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// MessageReceiver interface to handle messages for diagnostics

2
pkg/logs/diagnostic/noop_message_receiver.go → logs/diagnostic/noop_message_receiver.go
View File

@ -5,7 +5,7 @@
package diagnostic
import "flashcat.cloud/categraf/pkg/logs/message"
import "flashcat.cloud/categraf/logs/message"
// NoopMessageReceiver for cases where diagnosing messages is unsupported or not needed (serverless, tests)
type NoopMessageReceiver struct{}

2
pkg/logs/input/channel/launcher.go → logs/input/channel/launcher.go
View File

@ -7,7 +7,7 @@ package channel
import (
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/logs/pipeline"
)
// Launcher starts a channel reader on the given channel of string.

2
pkg/logs/input/channel/tailer.go → logs/input/channel/tailer.go
View File

@ -11,7 +11,7 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// serviceEnvVar is the environment variable of the service tag (this is used only for the serverless agent)

2
pkg/logs/input/file/file_provider.go → logs/input/file/file_provider.go
View File

@ -13,7 +13,7 @@ import (
"sort"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/status"
"flashcat.cloud/categraf/logs/status"
)
// OpenFilesLimitWarningType is the key of the message generated when too many

0
pkg/logs/input/file/open_file_nix.go → logs/input/file/open_file_nix.go
View File

0
pkg/logs/input/file/open_file_windows.go → logs/input/file/open_file_windows.go
View File

2
pkg/logs/input/file/position.go → logs/input/file/position.go
View File

@ -10,7 +10,7 @@ import (
"strconv"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/auditor"
"flashcat.cloud/categraf/logs/auditor"
)
// Position returns the position from where logs should be collected.

0
pkg/logs/input/file/rotate_nix.go → logs/input/file/rotate_nix.go
View File

0
pkg/logs/input/file/rotate_windows.go → logs/input/file/rotate_windows.go
View File

8
pkg/logs/input/file/scanner.go → logs/input/file/scanner.go
View File

@ -15,10 +15,10 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/auditor"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/pkg/logs/restart"
"flashcat.cloud/categraf/logs/auditor"
"flashcat.cloud/categraf/logs/message"
"flashcat.cloud/categraf/logs/pipeline"
"flashcat.cloud/categraf/logs/restart"
)
// rxContainerID is used in the shouldIgnore func to do a best-effort validation

8
pkg/logs/input/file/tailer.go → logs/input/file/tailer.go
View File

@ -18,10 +18,10 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/decoder"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/pkg/logs/parser"
"flashcat.cloud/categraf/pkg/logs/tag"
"flashcat.cloud/categraf/logs/decoder"
"flashcat.cloud/categraf/logs/message"
"flashcat.cloud/categraf/logs/parser"
"flashcat.cloud/categraf/logs/tag"
)
// DefaultSleepDuration represents the amount of time the tailer waits before reading new data when no data is received

2
pkg/logs/input/file/tailer_nix.go → logs/input/file/tailer_nix.go
View File

@ -14,7 +14,7 @@ import (
"log"
"path/filepath"
"flashcat.cloud/categraf/pkg/logs/decoder"
"flashcat.cloud/categraf/logs/decoder"
)
// setup sets up the file tailer

2
pkg/logs/input/file/tailer_windows.go → logs/input/file/tailer_windows.go
View File

@ -14,7 +14,7 @@ import (
"os"
"path/filepath"
"flashcat.cloud/categraf/pkg/logs/decoder"
"flashcat.cloud/categraf/logs/decoder"
)
// setup sets up the file tailer

6
pkg/logs/input/journald/launcher.go → logs/input/journald/launcher.go
View File

@ -11,9 +11,9 @@ package journald
import (
"log"
"flashcat.cloud/categraf/pkg/logs/auditor"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/pkg/logs/restart"
"flashcat.cloud/categraf/logs/auditor"
"flashcat.cloud/categraf/logs/pipeline"
"flashcat.cloud/categraf/logs/restart"
)
// Launcher is in charge of starting and stopping new journald tailers

4
pkg/logs/input/journald/launcher_nosystemd.go → logs/input/journald/launcher_nosystemd.go
View File

@ -10,8 +10,8 @@ package journald
import (
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/auditor"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/logs/auditor"
"flashcat.cloud/categraf/logs/pipeline"
)
// Launcher is not supported on no systemd environment.

2
pkg/logs/input/journald/tailer.go → logs/input/journald/tailer.go
View File

@ -18,7 +18,7 @@ import (
"github.com/coreos/go-systemd/sdjournal"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// defaultWaitDuration represents the delay before which we try to collect a new log from the journal

0
pkg/logs/input/journald/tailer_util.go → logs/input/journald/tailer_util.go
View File

0
pkg/logs/input/listener/errors.go → logs/input/listener/errors.go
View File

4
pkg/logs/input/listener/launcher.go → logs/input/listener/launcher.go
View File

@ -7,8 +7,8 @@ package listener
import (
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/pkg/logs/restart"
"flashcat.cloud/categraf/logs/pipeline"
"flashcat.cloud/categraf/logs/restart"
)
// Launcher summons different protocol specific listeners based on configuration

6
pkg/logs/input/listener/tailer.go → logs/input/listener/tailer.go
View File

@ -11,9 +11,9 @@ import (
"net"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/decoder"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/pkg/logs/parser"
"flashcat.cloud/categraf/logs/decoder"
"flashcat.cloud/categraf/logs/message"
"flashcat.cloud/categraf/logs/parser"
)
// Tailer reads data from a connection

4
pkg/logs/input/listener/tcp.go → logs/input/listener/tcp.go
View File

@ -13,8 +13,8 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/pkg/logs/restart"
"flashcat.cloud/categraf/logs/pipeline"
"flashcat.cloud/categraf/logs/restart"
)
// A TCPListener listens and accepts TCP connections and delegates the read operations to a tailer.

2
pkg/logs/input/listener/udp.go → logs/input/listener/udp.go
View File

@ -11,7 +11,7 @@ import (
"net"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/pipeline"
"flashcat.cloud/categraf/logs/pipeline"
)
// The UDP listener is limited by the size of its read buffer,

0
pkg/logs/message/message.go → logs/message/message.go
View File

0
pkg/logs/message/origin.go → logs/message/origin.go
View File

0
pkg/logs/message/status.go → logs/message/status.go
View File

0
pkg/logs/parser/parser.go → logs/parser/parser.go
View File

0
pkg/logs/pb/agent_logs_payload.pb.go → logs/pb/agent_logs_payload.pb.go
View File

14
pkg/logs/pipeline/pipeline.go → logs/pipeline/pipeline.go
View File

@ -9,13 +9,13 @@ import (
"context"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/client"
"flashcat.cloud/categraf/pkg/logs/client/http"
"flashcat.cloud/categraf/pkg/logs/client/tcp"
"flashcat.cloud/categraf/pkg/logs/diagnostic"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/pkg/logs/processor"
"flashcat.cloud/categraf/pkg/logs/sender"
"flashcat.cloud/categraf/logs/client"
"flashcat.cloud/categraf/logs/client/http"
"flashcat.cloud/categraf/logs/client/tcp"
"flashcat.cloud/categraf/logs/diagnostic"
"flashcat.cloud/categraf/logs/message"
"flashcat.cloud/categraf/logs/processor"
"flashcat.cloud/categraf/logs/sender"
)
// Pipeline processes and sends messages to the backend

10
pkg/logs/pipeline/provider.go → logs/pipeline/provider.go
View File

@ -9,13 +9,13 @@ import (
"context"
"sync/atomic"
"flashcat.cloud/categraf/pkg/logs/diagnostic"
"flashcat.cloud/categraf/logs/diagnostic"
config "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/auditor"
"flashcat.cloud/categraf/pkg/logs/client"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/pkg/logs/restart"
"flashcat.cloud/categraf/logs/auditor"
"flashcat.cloud/categraf/logs/client"
"flashcat.cloud/categraf/logs/message"
"flashcat.cloud/categraf/logs/restart"
)
// Provider provides message channels

2
pkg/logs/processor/encoder.go → logs/processor/encoder.go
View File

@ -9,7 +9,7 @@ import (
"unicode"
"unicode/utf8"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// Encoder turns a message into a raw byte array ready to be sent.

2
pkg/logs/processor/json.go → logs/processor/json.go
View File

@ -9,7 +9,7 @@ import (
"encoding/json"
"time"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
const nanoToMillis = 1000000

2
pkg/logs/processor/json_serverless.go → logs/processor/json_serverless.go
View File

@ -9,7 +9,7 @@ import (
"encoding/json"
"time"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// JSONServerlessEncoder is a shared json encoder sending a struct message field

4
pkg/logs/processor/processor.go → logs/processor/processor.go
View File

@ -11,8 +11,8 @@ import (
"sync"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/diagnostic"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/diagnostic"
"flashcat.cloud/categraf/logs/message"
)
// A Processor updates messages from an inputChan and pushes

4
pkg/logs/processor/proto.go → logs/processor/proto.go
View File

@ -8,8 +8,8 @@ package processor
import (
"time"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/pkg/logs/pb"
"flashcat.cloud/categraf/logs/message"
"flashcat.cloud/categraf/logs/pb"
)
// ProtoEncoder is a shared proto encoder.

2
pkg/logs/processor/raw.go → logs/processor/raw.go
View File

@ -10,7 +10,7 @@ import (
"time"
logsconfig "flashcat.cloud/categraf/config/logs"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// RawEncoder is a shared raw encoder.

0
pkg/logs/restart/parallel_stop.go → logs/restart/parallel_stop.go
View File

0
pkg/logs/restart/restart.go → logs/restart/restart.go
View File

0
pkg/logs/restart/serial_stop.go → logs/restart/serial_stop.go
View File

0
pkg/logs/restart/start.go → logs/restart/start.go
View File

0
pkg/logs/restart/starter.go → logs/restart/starter.go
View File

0
pkg/logs/restart/stop.go → logs/restart/stop.go
View File

2
pkg/logs/sender/batch_strategy.go → logs/sender/batch_strategy.go
View File

@ -11,7 +11,7 @@ import (
"sync"
"time"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// batchStrategy contains all the logic to send logs in batch.

2
pkg/logs/sender/message_buffer.go → logs/sender/message_buffer.go
View File

@ -6,7 +6,7 @@
package sender
import (
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// MessageBuffer accumulates messages to a buffer until the max capacity is reached.

4
pkg/logs/sender/sender.go → logs/sender/sender.go
View File

@ -8,8 +8,8 @@ package sender
import (
"context"
"flashcat.cloud/categraf/pkg/logs/client"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/client"
"flashcat.cloud/categraf/logs/message"
)
// Strategy should contain all logic to send logs to a remote destination

2
pkg/logs/sender/serializer.go → logs/sender/serializer.go
View File

@ -8,7 +8,7 @@ package sender
import (
"bytes"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
var (

2
pkg/logs/sender/stream_strategy.go → logs/sender/stream_strategy.go
View File

@ -9,7 +9,7 @@ import (
"context"
"log"
"flashcat.cloud/categraf/pkg/logs/message"
"flashcat.cloud/categraf/logs/message"
)
// StreamStrategy is a shared stream strategy.

0
pkg/logs/service/service.go → logs/service/service.go
View File

0
pkg/logs/service/services.go → logs/service/services.go
View File

0
pkg/logs/status/builder.go → logs/status/builder.go
View File

0
pkg/logs/status/status.go → logs/status/status.go
View File

0
pkg/logs/tag/local_provider.go → logs/tag/local_provider.go
View File

0
pkg/logs/tag/provider.go → logs/tag/provider.go
View File