専有サーバのIDをラベルに追加 (#90)

sacloud · Aug 3, 2022 · 2991b97 · 2991b97
1 parent b905097
commit 2991b97
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -210,8 +210,8 @@ The exporter returns the following metrics:
 #### Server
 
 | Metric                                   | Description                                                           | Labels                                                                                                                                                         |
-| ------                                   | -----------                                                           | ------                                                                                                                                                         |
-| sakuracloud_server_info                  | A metric with a constant '1' value labeled by server information      | `id`, `name`, `zone`, `cpus`, `disks`, `nics`, `memories`, `host`, `tags`, `description`                                                                       |
+| ------                                   | -----------                                                           |----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| sakuracloud_server_info                  | A metric with a constant '1' value labeled by server information      | `id`, `name`, `zone`, `cpus`, `disks`, `nics`, `memories`, `host`, `tags`, `description`, `private_host_id`                                                    |
 | sakuracloud_server_up                    | If 1 the server is up and running, 0 otherwise                        | `id`, `name`, `zone`                                                                                                                                           |
 | sakuracloud_server_cpus                  | Number of server's vCPU cores                                         | `id`, `name`, `zone`                                                                                                                                           |
 | sakuracloud_server_cpu_time              | Server's CPU time(unit: ms)                                           | `id`, `name`, `zone`                                                                                                                                           |

diff --git a/collector/collector_test.go b/collector/collector_test.go
@@ -90,7 +90,7 @@ func requireMetricsEqual(t *testing.T, m1, m2 []*collectedMetric) {
 		}
 		return labelToString(m2[i].metric.Label) < labelToString(m2[j].metric.Label)
 	})
-	require.Equal(t, m1, m2)
+	require.EqualValues(t, m1, m2)
 }
 
 func initLoggerAndErrors() {

diff --git a/collector/server.go b/collector/server.go
@@ -62,7 +62,7 @@ func NewServerCollector(ctx context.Context, logger log.Logger, errors *promethe
 	errors.WithLabelValues("server").Add(0)
 
 	serverLabels := []string{"id", "name", "zone"}
-	serverInfoLabels := append(serverLabels, "cpus", "disks", "nics", "memories", "host", "tags", "description")
+	serverInfoLabels := append(serverLabels, "cpus", "disks", "nics", "memories", "host", "tags", "description", "private_host_id")
 	diskLabels := append(serverLabels, "disk_id", "disk_name", "index")
 	diskInfoLabels := append(diskLabels, "plan", "interface", "size", "tags", "description", "storage_id", "storage_generation", "storage_class")
 	nicLabels := append(serverLabels, "interface_id", "index")
@@ -329,6 +329,7 @@ func (c *ServerCollector) serverInfoLabels(server *platform.Server) []string {
 		instanceHost,
 		flattenStringSlice(server.Tags),
 		server.Description,
+		server.PrivateHostID.String(),
 	)
 }
 

diff --git a/collector/server_test.go b/collector/server_test.go
@@ -116,6 +116,8 @@ func TestServerCollector_Collect(t *testing.T) {
 					},
 				},
 			},
+			PrivateHostID:   3001,
+			PrivateHostName: "private-host-name",
 			Interfaces: []*iaas.InterfaceView{
 				{
 					ID:           301,
@@ -179,16 +181,17 @@ func TestServerCollector_Collect(t *testing.T) {
 				{
 					desc: c.ServerInfo,
 					metric: createGaugeMetric(1, map[string]string{
-						"id":          "101",
-						"name":        "server",
-						"zone":        "is1a",
-						"cpus":        "2",
-						"disks":       "1",
-						"nics":        "1",
-						"memories":    "4",
-						"host":        "sacXXX",
-						"tags":        ",tag1,tag2,",
-						"description": "desc",
+						"id":              "101",
+						"name":            "server",
+						"zone":            "is1a",
+						"cpus":            "2",
+						"disks":           "1",
+						"nics":            "1",
+						"memories":        "4",
+						"host":            "sacXXX",
+						"tags":            ",tag1,tag2,",
+						"description":     "desc",
+						"private_host_id": "3001",
 					}),
 				},
 				{
@@ -236,7 +239,7 @@ func TestServerCollector_Collect(t *testing.T) {
 				// },
 				{
 					desc: c.NICBandwidth,
-					metric: createGaugeMetric(1000, map[string]string{
+					metric: createGaugeMetric(0, map[string]string{ // 専有ホストの場合は0
 						"id":           "101",
 						"name":         "server",
 						"zone":         "is1a",
@@ -329,16 +332,17 @@ func TestServerCollector_Collect(t *testing.T) {
 				{
 					desc: c.ServerInfo,
 					metric: createGaugeMetric(1, map[string]string{
-						"id":          "101",
-						"name":        "server",
-						"zone":        "is1a",
-						"cpus":        "2",
-						"disks":       "1",
-						"nics":        "1",
-						"memories":    "4",
-						"host":        "sacXXX",
-						"tags":        ",tag1,tag2,",
-						"description": "desc",
+						"id":              "101",
+						"name":            "server",
+						"zone":            "is1a",
+						"cpus":            "2",
+						"disks":           "1",
+						"nics":            "1",
+						"memories":        "4",
+						"host":            "sacXXX",
+						"tags":            ",tag1,tag2,",
+						"description":     "desc",
+						"private_host_id": "3001",
 					}),
 				},
 				{
@@ -386,7 +390,7 @@ func TestServerCollector_Collect(t *testing.T) {
 				// },
 				{
 					desc: c.NICBandwidth,
-					metric: createGaugeMetric(1000, map[string]string{
+					metric: createGaugeMetric(0, map[string]string{
 						"id":           "101",
 						"name":         "server",
 						"zone":         "is1a",
@@ -453,16 +457,17 @@ func TestServerCollector_Collect(t *testing.T) {
 				{
 					desc: c.ServerInfo,
 					metric: createGaugeMetric(1, map[string]string{
-						"id":          "101",
-						"name":        "server",
-						"zone":        "is1a",
-						"cpus":        "2",
-						"disks":       "0",
-						"nics":        "0",
-						"memories":    "4",
-						"host":        "sacXXX",
-						"tags":        "",
-						"description": "",
+						"id":              "101",
+						"name":            "server",
+						"zone":            "is1a",
+						"cpus":            "2",
+						"disks":           "0",
+						"nics":            "0",
+						"memories":        "4",
+						"host":            "sacXXX",
+						"tags":            "",
+						"description":     "",
+						"private_host_id": "",
 					}),
 				},
 				{

diff --git a/e2e/minimum/e2e_test.go b/e2e/minimum/e2e_test.go
@@ -1,3 +1,17 @@
+// Copyright 2019-2022 The sacloud/sakuracloud_exporter Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build e2e
 // +build e2e