Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/academic/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func main() {
}

// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/api/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/captcha/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/classroom/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/common/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func loadNotice(db *db.Database) {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/course/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/launch_screen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/oa/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/paper/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/user/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/version/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func init() {

func main() {
// Open Telemetry provider
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint, config.Uptrace.DSN)
shutdown := tracing.NewOtelProvider(serviceName, config.Otel.Endpoint)

r, err := etcd.NewEtcdRegistry([]string{config.Etcd.Addr})
if err != nil {
Expand Down
96 changes: 96 additions & 0 deletions config/alloy/config.alloy
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*********************************************
* loki 文件管道
*********************************************/

local.file_match "local_files" {
path_targets = [{"__path__" = "/var/log/*/*/*/*.log"}]
sync_period = "5s"
}

loki.source.file "log_scrape" {
targets = local.file_match.local_files.targets
forward_to = [loki.process.filter_logs.receiver]
tail_from_end = true
}

loki.process "filter_logs" {
stage.drop {
source = ""
expression = ".*Connection closed by authenticating user root"
drop_counter_reason = "noisy"
}
forward_to = [loki.process.add_labels.receiver]
}

loki.process "add_labels" {
stage.json {
expressions = {
service = "",
level = "",
trace_id = "",
span_id = "",
}
}

stage.labels {
values = {
level = "level",
service = "service",
}
}

stage.structured_metadata {
values = {
trace_id = "trace_id",
span_id = "span_id",
}
}

forward_to = [loki.write.grafana_loki.receiver]
}

loki.write "grafana_loki" {
endpoint {
url = "http://fzuhelper-loki:3100/loki/api/v1/push"

// basic_auth {
// username = "admin"
// password = "admin"
// }
}
}

/*********************************************
* otlp管道
* 流程:otelcol.receiver -> processor -> exporter -> Tempo后端
*********************************************/

otelcol.receiver.otlp "ingest" {
grpc {
endpoint = "0.0.0.0:4317"
}

http {
endpoint = "0.0.0.0:4318"
}

output {
traces = [otelcol.processor.batch.traces.input]
}
}

otelcol.processor.batch "traces" {
output {
traces = [otelcol.exporter.otlp.tempo.input]
}
}

otelcol.exporter.otlp "tempo" {
client {
endpoint = "fzuhelper-tempo:4317"
tls {
insecure = true
insecure_skip_verify = true
}
}
}
5 changes: 1 addition & 4 deletions config/config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ jaeger:
addr: 127.0.0.1:6831

otel:
endpoint: 127.0.0.1:14317

uptrace:
dsn: ''
endpoint: 127.0.0.1:4317

kafka:
address: 127.0.0.1:9092
Expand Down
2 changes: 0 additions & 2 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ var (
Service *service
Jaeger *jaeger
Otel *otel
Uptrace *uptrace
Etcd *etcd
Redis *redis
DefaultUser *defaultUser
Expand Down Expand Up @@ -139,7 +138,6 @@ func configMapping(srv string) {
AI = &c.AI
Jaeger = &c.Jaeger
Otel = &c.Otel
Uptrace = &c.Uptrace
Mysql = &c.MySQL
Redis = &c.Redis
Elasticsearch = &c.Elasticsearch
Expand Down
33 changes: 33 additions & 0 deletions config/loki/loki-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
auth_enabled: false

server:
http_listen_port: 3100
log_level: warn

common:
instance_addr: 127.0.0.1
path_prefix: /loki
storage:
filesystem:
chunks_directory: /loki/chunks
rules_directory: /loki/rules
replication_factor: 1
ring:
kvstore:
store: inmemory

limits_config:
retention_period: ${RETENTION_PERIOD}

schema_config:
configs:
- from: 2020-10-24
store: tsdb
object_store: filesystem
schema: v13
index:
prefix: index_
period: 24h

table_manager:
retention_deletes_enabled: false
26 changes: 26 additions & 0 deletions config/tempo/tempo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
server:
http_listen_port: 3200

distributor:
receivers:
otlp:
protocols:
grpc:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:4318

ingester:
max_block_duration: 5m

compactor:
compaction:
block_retention: ${BLOCK_RETENTION}

storage:
trace:
backend: local
wal:
path: /var/tempo/wal
local:
path: /var/tempo/blocks
5 changes: 0 additions & 5 deletions config/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ type otel struct {
Endpoint string
}

type uptrace struct {
DSN string `mapstructure:"dsn"`
}

type etcd struct {
Addr string
}
Expand Down Expand Up @@ -198,7 +194,6 @@ type config struct {
MySQL mySQL
Jaeger jaeger
Otel otel
Uptrace uptrace
Etcd etcd
RabbitMQ rabbitMQ
Redis redis
Expand Down
Loading