bcs-monitor规范修改golangci-lint #2623
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
# Conflicts: # bcs-services/bcs-monitor/cmd/bcs-monitor/api.go
ifooth
reviewed
Sep 21, 2023
| */ | ||
|
|
||
| // Package logrule ... |
| storeList []string, | ||
| httpSDURLs []string, | ||
| g *run.Group, | ||
| func NewQueryAPI(ctx context.Context, reg *prometheus.Registry, tracer opentracing.Tracer, kitLogger gokit.Logger, |
| @@ -26,6 +27,9 @@ import ( | |||
| const ( | |||
| // PROVIDER xxx | |||
| PROVIDER = `provider="PROMETHEUS"` | |||
| // CLUSTERID xxx | |||
| CLUSTERID = `cluster_id="%<clusterID>s", namespace="%<namespace>s", ` + | |||
There was a problem hiding this comment.
- 命名可以改为ContainerMatcher
- 公共的matcher可以base目录
| @@ -41,6 +42,18 @@ const ( | |||
| // 默认查询分片，每10个节点一组并发查询，限制并发为 20，防止对数据源造成压力 | |||
| scale = 10 | |||
| defaultQueryConcurrent = 20 | |||
|
|
|||
| // SUMMAX ... | |||
| SUMMAX = `sum(max by(bk_instance) (rate(node_disk_io_time_seconds_total{%<cluster>s, ` + | |||
| SUMNODE = `%<cluster>s, bk_instance=~"%<instance>s", fstype=~"%<fstype>s", ` + | ||
| `mountpoint=~"%<mountpoint>s", %<provider>s` | ||
| // SUMNODEFILE ... | ||
| SUMNODEFILE = `sum(node_filesystem_size_bytes{` |
There was a problem hiding this comment.
这个是解什么问题？ 重复率么？ 不多就nolint下， 这样非常不好看原生语法， 上面的如果不多，都可以nolint下
adevjoe
suggested changes
Sep 28, 2023
| @@ -61,7 +67,7 @@ func handleContainerMetric(c *rest.Context, promql string) (interface{}, error) | |||
| // @Router /namespaces/namespace/pods/:pod/containers/:container/cpu_usage [GET] | |||
| func ContainerCPUUsage(c *rest.Context) (interface{}, error) { | |||
| promql := | |||
| `bcs:container:cpu_usage{cluster_id="%<clusterId>s", namespace="%<namespace>s", pod_name=~"%<podName>s", container_name=~"%<containerName>s", %<provider>s}` | |||
| `bcs:container:cpu_usage{` + CLUSTERID + `}` | |||
adevjoe
approved these changes
Oct 7, 2023
wenxinlee2015
approved these changes
Oct 7, 2023
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.
bcs-monitor规范修改golangci-lint