update metrics collect to nebula 3.0 #38
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
kqzh
commented
Dec 28, 2021
•
kqzh
commented
- support collect space metric
- support collect nebula 3.0 metric
- remove bare-metal namespace label
veezhang
reviewed
Jan 6, 2022
exporter/convert.go
Outdated
| } | ||
|
|
||
| func convertToMap(metrics []string) map[string]MetricValue { | ||
| matches := make(map[string]MetricValue) |
There was a problem hiding this comment.
give a default length of len(metrics)?
veezhang
reviewed
Jan 6, 2022
exporter/convert.go
Outdated
|
|
||
| type MetricValue struct { | ||
| Value string | ||
| Label map[string]string |
veezhang
reviewed
Jan 6, 2022
exporter/convert.go
Outdated
| if start == -1 { | ||
| return metric, nil | ||
| } | ||
| end := strings.LastIndex(metric, "}") |
veezhang
reviewed
Jan 6, 2022
exporter/type.go
Outdated
Comment on lines
9
to
11
| GraphdComponent ComponentType = "graphd" | ||
| MetadComponent ComponentType = "metad" | ||
| StoragedComponent ComponentType = "storaged" |
There was a problem hiding this comment.
remove it if no more used.
veezhang
reviewed
Jan 6, 2022
exporter/metric.go
Outdated
| Timeout: time.Second * 2, | ||
| } | ||
|
|
||
| resp, err := httpClient.Get(fmt.Sprintf("http://%s:%d/stats?stats=", ipAddress, port)) |
veezhang
reviewed
Jan 6, 2022
exporter/metric.go
Outdated
Comment on lines
59
to
63
| countStr := "count=0" | ||
| if status.Status == "running" { | ||
| countStr = strings.Replace(countStr, "0", "1", 1) | ||
| } | ||
| statusMetrics := []string{countStr} |
There was a problem hiding this comment.
It's no good to usestrings.Replace(countStr, "0", "1", 1)?
veezhang
reviewed
Jan 6, 2022
| } | ||
|
|
||
| func (exporter *NebulaExporter) Describe(ch chan<- *prometheus.Desc) {} |
veezhang
reviewed
Jan 6, 2022
exporter/exporter.go
Outdated
Comment on lines
133
to
143
| ch <- prometheus.MustNewConstMetric(prometheus.NewDesc( | ||
| fmt.Sprintf("%s_%s_%s", FQNamespace, componentType, strings.ReplaceAll(metric, ".", "_")), | ||
| "", labels, | ||
| nil), | ||
| prometheus.GaugeValue, | ||
| v, | ||
| labelValues..., | ||
| ) |
MegaByte875
reviewed
Jan 6, 2022
| } | ||
|
|
||
| label := make(map[string]string) | ||
| labelsStr := strings.Split(metric[start+1:end], ",") |
There was a problem hiding this comment.
becase the metric may like this num_queries{space=nba,partition=1}
| } | ||
| } | ||
|
|
||
| func (exporter *NebulaExporter) collect(wg *sync.WaitGroup, namespace, clusterName string, instance Instance, ch chan<- prometheus.Metric) { | ||
| podIpAddress := instance.EndpointIP | ||
| podHttpPort := instance.EndpointPort | ||
|
|
||
| if podHttpPort == 0 { | ||
| if podHttpPort <= 0 { |
There was a problem hiding this comment.
because port < 0 also invalid
|
|
||
| // FQNamespace represents the prometheus FQName | ||
| FQNamespace = "nebula" | ||
| NonNamespace = "none_namespace" |
There was a problem hiding this comment.
none seems more concise
There was a problem hiding this comment.
I consider concise name may easy to used by user, so I use a long name none_namespace
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.