Skip to content

Commit

Permalink
feat: collector dropper processor support raw data
Browse files Browse the repository at this point in the history
  • Loading branch information
chengjoey committed Aug 6, 2024
1 parent 8543dc0 commit 3837d8d
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 11 deletions.
9 changes: 1 addition & 8 deletions cmd/monitor/collector/bootstrap-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,12 @@ erda.oap.collector.core:

erda.oap.collector.receiver.prometheus-remote-write@default:

grpc-client@erda.core.token:
addr: "${ERDA_SERVER_GRPC_ADDR:erda-server:8096}"
erda.core.token-client:

erda.oap.collector.authentication:
sync_interval: ${COLLECTOR_AUTHENTICATION_AK_SYNC_INTERVAL:2m}

erda.oap.collector.receiver.collector:
auth:
username: "${COLLECTOR_AUTH_USERNAME:collector}"
password: "${COLLECTOR_AUTH_PASSWORD:G$9767bP32drYFPWrK4XMLRMTatiM6cU}"
force: ${COLLECTOR_AUTH_FORCE:false}
skip: ${COLLECTOR_AUTH_SKIP:false}
skip: ${COLLECTOR_AUTH_SKIP:true}

erda.oap.collector.receiver.prometheus-remote-write@external_metrics:
remote_write_url: "${EXTERNAL_METRIC_REMOTE_WRITE_URL:/api/v1/external-prometheus-remote-write}"
Expand Down
4 changes: 4 additions & 0 deletions cmd/monitor/collector/bootstrap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ erda.oap.collector.core:
pipelines:
raws:
- receivers: [ "erda.oap.collector.receiver.collector" ]
processors:
- "erda.oap.collector.processor.dropper@application-agent"
exporters: [ "erda.oap.collector.exporter.kafka@collector" ]

- receivers:
Expand Down Expand Up @@ -486,6 +488,8 @@ erda.oap.collector.processor.aggregator@mem-percent:
target_key: "mem_usage_percent"

# ************* processors *************
erda.oap.collector.processor.dropper@application-agent:
metric_prefix: ${APPLICATION_AGENT_DROP_PREFIX}

# ************* processors *************

Expand Down
14 changes: 14 additions & 0 deletions internal/tools/monitor/oap/collector/core/model/odata/raw.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

package odata

import "encoding/json"

var _ ObservableData = &Raw{}

// bytes representation of ObservableData for performance
Expand All @@ -33,3 +35,15 @@ func NewRaw(data []byte) *Raw {
func (r *Raw) GetTags() map[string]string {
return map[string]string{}
}

type nameField struct {
Name string `json:"name"`
}

func (r *Raw) GetName() string {
var name nameField
if err := json.Unmarshal(r.Data, &name); err != nil {
return ""
}
return name.Name
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,16 @@ func (p *provider) ProcessLog(item *log.Log) (*log.Log, error) { return item, ni

func (p *provider) ProcessSpan(item *trace.Span) (*trace.Span, error) { return item, nil }

func (p *provider) ProcessRaw(item *odata.Raw) (*odata.Raw, error) { return item, nil }
func (p *provider) ProcessRaw(item *odata.Raw) (*odata.Raw, error) {
if len(p.Cfg.MetricPrefix) == 0 {
return item, nil
}
name := item.GetName()
if len(name) > 0 && strings.HasPrefix(name, p.Cfg.MetricPrefix) {
return nil, nil
}
return item, nil
}

func (p *provider) ProcessProfile(*profile.ProfileIngest) (*profile.Output, error) {
return &profile.Output{}, nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,19 @@ var _ model.Receiver = (*provider)(nil)
type provider struct {
Cfg *config
Log logs.Logger
Router httpserver.Router `autowired:"http-router"`
Validator authentication.Validator `autowired:"erda.oap.collector.authentication.Validator"`
Router httpserver.Router `autowired:"http-router"`
Validator authentication.Validator

auth *Authenticator
consumer model.ObservableDataConsumerFunc
}

type skipValidator struct{}

func (skipValidator) Validate(scope string, scopeId string, token string) bool {
return true
}

func (p *provider) ComponentClose() error {
return nil
}
Expand All @@ -62,6 +68,11 @@ func (p *provider) RegisterConsumer(consumer model.ObservableDataConsumerFunc) {

// Run this is optional
func (p *provider) Init(ctx servicehub.Context) error {
if p.Cfg.Auth.Skip {
p.Validator = skipValidator{}
} else {
p.Validator = ctx.Service("erda.oap.collector.authentication.Validator").(authentication.Validator)
}
p.auth = NewAuthenticator(
WithLogger(p.Log),
WithValidator(p.Validator),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ func Test_provider_Init(t *testing.T) {

p := &provider{
Router: &mockRouter{t: t},
Cfg: &config{},
}
p.Cfg.Auth.Skip = true
assert.Nil(t, p.Init(nil))
}

Expand Down

0 comments on commit 3837d8d

Please sign in to comment.