update image tag (#32)

MegaByte875 · web-flow · commit 99be9cff9650 · 2021-08-18T16:13:17.000+08:00
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 PROJECT="nebula-exporter"
 
 GO ?= go
-VERSION ?= v0.0.4
+VERSION ?= v0.0.5
 DockerUser=vesoft
 
 ifeq (,$(shell go env GOBIN))
diff --git a/README-CN.md b/README-CN.md
@@ -76,12 +76,12 @@ scrape_configs:
 ```shell
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "<<PATH_OF_CONFIG_FILE>>:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 
 # 例如:
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "$(pwd)/deploy/bare-metal/config.yaml:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 ```
 
 ## 在裸机上运行
diff --git a/README.md b/README.md
@@ -76,12 +76,12 @@ And adjust the host name `NEBULA_STATS_EXPORTER_HOSTNAME` accordingly.
 ```shell
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "<<PATH_OF_CONFIG_FILE>>:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 
 # For example:
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "$(pwd)/deploy/bare-metal/config.yaml:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 ```
 
 ## Run on Bare Metal
diff --git a/charts/index.yaml b/charts/index.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 entries:
   nebula-exporter:
   - apiVersion: v1
-    appVersion: v2.0.0
-    created: "2021-06-22T11:26:39.869263+08:00"
+    appVersion: v2.5.0
+    created: "2021-08-16T11:54:34.149524302+08:00"
     description: Nebula Graph stats exporter for prometheus
-    digest: f29e9f0aa30736c059fda743d3442deb72db97d7d42d06fd75e7663f5b9d17f9
+    digest: 8b02d03f03d5d0ee7fbb2dc6fdb92ad5878409f07d928a2d778413dfd7a0b8de
     home: https://nebula-graph.io
     icon: https://github.com/vesoft-inc/nebula/raw/master/docs/logo.png
     keywords:
@@ -28,6 +28,6 @@ entries:
     sources:
     - https://github.com/vesoft-inc/nebula
     urls:
-    - https://vesoft-inc.github.io/nebula-stats-exporter/charts/nebula-exporter-0.2.0.tgz
-    version: 0.2.0
-generated: "2021-06-22T11:26:39.868345+08:00"
+    - https://vesoft-inc.github.io/nebula-stats-exporter/charts/nebula-exporter-v0.0.5.tgz
+    version: v0.0.5
+generated: "2021-08-16T11:54:34.14868979+08:00"
diff --git a/charts/nebula-exporter-0.2.0.tgz b/charts/nebula-exporter-0.2.0.tgz
diff --git a/charts/nebula-exporter-v0.0.5.tgz b/charts/nebula-exporter-v0.0.5.tgz
diff --git a/charts/nebula-exporter/values.yaml b/charts/nebula-exporter/values.yaml
@@ -17,7 +17,7 @@ startUp:
 
 image:
   repository: vesoft/nebula-stats-exporter
-  tag: v0.0.4
+  tag: v0.0.5
   pullPolicy: IfNotPresent
 
 serviceAccount:
diff --git a/deploy/bare-metal/example-CN.md b/deploy/bare-metal/example-CN.md
@@ -5,12 +5,12 @@
 ```shell
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "<<PATH_OF_CONFIG_FILE>>:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 
 # 例如:
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "$(pwd)/deploy/bare-metal/config.yaml:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 ```
 
 ## 安装 prometheus
diff --git a/deploy/bare-metal/example.md b/deploy/bare-metal/example.md
@@ -5,12 +5,12 @@
 ```shell
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "<<PATH_OF_CONFIG_FILE>>:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 
 # For example:
 $ docker run -d --restart=always --name nebula-stats-exporter -p 9100:9100 \
     -v "$(pwd)/deploy/bare-metal/config.yaml:/config.yaml" \
-    vesoft/nebula-stats-exporter:v0.0.4 --bare-metal --bare-metal-config=/config.yaml
+    vesoft/nebula-stats-exporter:v0.0.5 --bare-metal --bare-metal-config=/config.yaml
 ```
 
 ## Install prometheus
diff --git a/deploy/kubernetes/README-CN.md b/deploy/kubernetes/README-CN.md
@@ -85,7 +85,7 @@ $ helm show values nebula-exporter/nebula-exporter
 | `startUp.listenPort` | Nebula metrics 服务监听端口 | `9100` |
 | `startUp.maxRequests` | 最大并行抓取请求数，使用 0 则不限制 | `40` |
 | `image.repository` | Nebula stats exporter image repository | `vesoft/nebula-stats-exporter` |
-| `image.tag` | Nebula stats exporter image tag | `v0.0.4` |
+| `image.tag` | Nebula stats exporter image tag | `v0.0.5` |
 | `image.pullPolicy` | Nebula stats exporter imagePullPolicy | `IfNotPresent` |
 | `serviceAccount.create` | 指定是否应创建 service account | `true` |
 | `serviceAccount.annotations` | 添加到 service account 的 annotations | `{}` |
diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
@@ -85,7 +85,7 @@ The following table lists is the configurable parameters of the chart and their
 | `startUp.listenPort` | The nebula metrics server listening port | `9100` |
 | `startUp.maxRequests` | Maximum number of parallel scrape requests, use 0 for no limit | `40` |
 | `image.repository` | Nebula stats exporter image repository | `vesoft/nebula-stats-exporter` |
-| `image.tag` | Nebula stats exporter image tag | `v0.0.4` |
+| `image.tag` | Nebula stats exporter image tag | `v0.0.5` |
 | `image.pullPolicy` | Nebula stats exporter imagePullPolicy | `IfNotPresent` |
 | `serviceAccount.create` | Specifies whether a service account should be created | `true` |
 | `serviceAccount.annotations` | Annotations to add to the service account | `{}` |
diff --git a/exporter/type.go b/exporter/type.go
@@ -1,11 +1,11 @@
 package exporter
 
-const NebulaItemClusterName = "_nebula"
+const DefaultClusterName = "default"
 
 type (
 	StaticConfig struct {
-		Version     string       `yaml:"version"`
-		Clusters    []Cluster    `yaml:"clusters"`
+		Version  string    `yaml:"version"`
+		Clusters []Cluster `yaml:"clusters"`
 		// Deprecated: use Clusters instead.
 		// TODO: Remove NebulaItems
 		NebulaItems []NebulaItem `yaml:"nebulaItems"`
diff --git a/main.go b/main.go
@@ -95,7 +95,7 @@ func main() {
 				})
 			}
 			config.Clusters = append(config.Clusters, exporter.Cluster{
-				Name:      exporter.NebulaItemClusterName,
+				Name:      exporter.DefaultClusterName,
 				Instances: instances,
 			})
 			config.NebulaItems = nil

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func main() {`
`95`	`95`	`})`
`96`	`96`	`}`
`97`	`97`	`config.Clusters = append(config.Clusters, exporter.Cluster{`
`98`		`- Name: exporter.NebulaItemClusterName,`
	`98`	`+ Name: exporter.DefaultClusterName,`
`99`	`99`	`Instances: instances,`
`100`	`100`	`})`
`101`	`101`	`config.NebulaItems = nil`