p58036791
/
nightingale
forked from pneymrl2f/nightingale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: change collect config

Browse Source
master
710leo 4 years ago
parent 979a77eafa
commit e396ad4f67
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
build.sh
Unescape View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# release version # release version
version=5.0.0-rc2 version=5.0.0-rc3
export GO111MODULE=on export GO111MODULE=on
go build -ldflags "-X main.version=${version}" -o n9e-server main.go go build -ldflags "-X main.version=${version}" -o n9e-server main.go

32
timer/collect_rule.go
Unescape View File

@ -121,7 +121,7 @@ func changeCollectRule(rule *models.CollectRule) error {
config := PortCollectFormat{ config := PortCollectFormat{
Instances: []struct { Instances: []struct {
MinCollectionInterval int `json:"minCollectionInterval,omitempty"` MinCollectionInterval int `json:"min_collection_interval,omitempty"`
Tags []string `json:"tags,omitempty"` Tags []string `json:"tags,omitempty"`
Protocol string `json:"protocol" description:"udp or tcp"` Protocol string `json:"protocol" description:"udp or tcp"`
Port int `json:"port"` Port int `json:"port"`
@ -150,8 +150,8 @@ func changeCollectRule(rule *models.CollectRule) error {
config := ScriptCollectFormat{ config := ScriptCollectFormat{
Instances: []struct { Instances: []struct {
MinCollectionInterval int `json:"minCollectionInterval,omitempty"` MinCollectionInterval int `json:"min_collection_interval,omitempty"`
FilePath string `json:"filePath"` FilePath string `json:"file_path"`
Root string `json:"root"` Root string `json:"root"`
Params string `json:"params"` Params string `json:"params"`
Env map[string]string `json:"env"` Env map[string]string `json:"env"`
@ -181,10 +181,10 @@ func changeCollectRule(rule *models.CollectRule) error {
config := LogCollectFormat{ config := LogCollectFormat{
Instances: []struct { Instances: []struct {
MetricName string `json:"metricName"` // MetricName string `json:"metric_name"` //
FilePath string `json:"filePath"` FilePath string `json:"file_path"`
Pattern string `json:"pattern"` Pattern string `json:"pattern"`
TagsPattern map[string]string `json:"tagsPattern"` TagsPattern map[string]string `json:"tags_pattern"`
Func string `json:"func"` Func string `json:"func"`
}{{ }{{
MetricName: rule.Name, MetricName: rule.Name,
@ -209,10 +209,10 @@ func changeCollectRule(rule *models.CollectRule) error {
config := ProcCollectFormat{ config := ProcCollectFormat{
Instances: []struct { Instances: []struct {
MinCollectionInterval int `json:"minCollectionInterval,omitempty"` MinCollectionInterval int `json:"min_collection_interval,omitempty"`
Tags []string `json:"tags,omitempty"` Tags []string `json:"tags,omitempty"`
Target string `json:"target"` Target string `json:"target"`
CollectMethod string `json:"collectMethod" description:"name or cmdline"` CollectMethod string `json:"collect_method" description:"name or cmdline"`
}{{ }{{
MinCollectionInterval: rule.Step, MinCollectionInterval: rule.Step,
Tags: strings.Fields(strings.Replace(rule.AppendTags, "=", ":", 1)), Tags: strings.Fields(strings.Replace(rule.AppendTags, "=", ":", 1)),
@ -233,8 +233,8 @@ func changeCollectRule(rule *models.CollectRule) error {
type ScriptCollectFormat struct { type ScriptCollectFormat struct {
Instances []struct { Instances []struct {
MinCollectionInterval int `json:"minCollectionInterval,omitempty"` MinCollectionInterval int `json:"min_collection_interval,omitempty"`
FilePath string `json:"filePath"` FilePath string `json:"file_path"`
Root string `json:"root"` Root string `json:"root"`
Params string `json:"params"` Params string `json:"params"`
Env map[string]string `json:"env"` Env map[string]string `json:"env"`
@ -245,7 +245,7 @@ type ScriptCollectFormat struct {
type PortCollectFormat struct { type PortCollectFormat struct {
Instances []struct { Instances []struct {
MinCollectionInterval int `json:"minCollectionInterval,omitempty"` MinCollectionInterval int `json:"min_collection_interval,omitempty"`
Tags []string `json:"tags,omitempty"` Tags []string `json:"tags,omitempty"`
Protocol string `json:"protocol" description:"udp or tcp"` Protocol string `json:"protocol" description:"udp or tcp"`
Port int `json:"port"` Port int `json:"port"`
@ -255,19 +255,19 @@ type PortCollectFormat struct {
type LogCollectFormat struct { type LogCollectFormat struct {
Instances []struct { Instances []struct {
MetricName string `json:"metricName"` // MetricName string `json:"metric_name"` //
FilePath string `json:"filePath"` // FilePath string `json:"file_path"` //
Pattern string `json:"pattern"` // Pattern string `json:"pattern"` //
TagsPattern map[string]string `json:"tagsPattern"` // TagsPattern map[string]string `json:"tags_pattern"` //
Func string `json:"func"` // count(c), histogram(h) Func string `json:"func"` // count(c), histogram(h)
} `json:"instances"` } `json:"instances"`
} }
type ProcCollectFormat struct { type ProcCollectFormat struct {
Instances []struct { Instances []struct {
MinCollectionInterval int `json:"minCollectionInterval,omitempty"` MinCollectionInterval int `json:"min_collection_interval,omitempty"`
Tags []string `json:"tags,omitempty"` Tags []string `json:"tags,omitempty"`
Target string `json:"target"` Target string `json:"target"`
CollectMethod string `json:"collectMethod" description:"name or cmdline"` CollectMethod string `json:"collect_method" description:"name or cmdline"`
} `json:"instances"` } `json:"instances"`
} }

Write Preview
Loading…
Cancel
Save