Rename to or ID

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

discovery/scaleway/instance.go

@@ -44,7 +44,7 @@ const (
 	instanceLocationHypervisorID   = instanceLabelPrefix + "location_hypervisor_id"
 	instanceLocationNodeID         = instanceLabelPrefix + "location_node_id"
 	instanceNameLabel              = instanceLabelPrefix + "name"
-	instanceOrganizationLabel      = instanceLabelPrefix + "organization"
+	instanceOrganizationLabel      = instanceLabelPrefix + "organization_id"
 	instancePrivateIPv4Label       = instanceLabelPrefix + "private_ipv4"
 	instanceProjectLabel           = instanceLabelPrefix + "project_id"
 	instancePublicIPv4Label        = instanceLabelPrefix + "public_ipv4"

discovery/scaleway/instance_test.go

@@ -74,7 +74,7 @@ api_url: %s
 			"__meta_scaleway_instance_location_hypervisor_id": "1601",
 			"__meta_scaleway_instance_location_node_id":       "29",
 			"__meta_scaleway_instance_name":                   "scw-nervous-shirley",
-			"__meta_scaleway_instance_organization":           "cb334986-b054-4725-9d3a-40850fdc6015",
+			"__meta_scaleway_instance_organization_id":        "cb334986-b054-4725-9d3a-40850fdc6015",
 			"__meta_scaleway_instance_private_ipv4":           "10.70.60.57",
 			"__meta_scaleway_instance_project_id":             "cb334986-b054-4725-9d5a-30850fdc6015",
 			"__meta_scaleway_instance_public_ipv6":            "2001:bc8:630:1e1c::1",
@@ -97,7 +97,7 @@ api_url: %s
 			"__meta_scaleway_instance_location_hypervisor_id": "201",
 			"__meta_scaleway_instance_location_node_id":       "5",
 			"__meta_scaleway_instance_name":                   "scw-quizzical-feistel",
-			"__meta_scaleway_instance_organization":           "cb334986-b054-4725-9d3a-40850fdc6015",
+			"__meta_scaleway_instance_organization_id":        "cb334986-b054-4725-9d3a-40850fdc6015",
 			"__meta_scaleway_instance_private_ipv4":           "10.193.162.9",
 			"__meta_scaleway_instance_project_id":             "cb334986-b054-4725-9d5a-30850fdc6015",
 			"__meta_scaleway_instance_public_ipv4":            "151.115.45.127",

docs/configuration/configuration.md

@@ -1546,7 +1546,7 @@ The following meta labels are available on targets during [relabeling](#relabel_
 * `__meta_scaleway_instance_location_hypervisor_id`: the hypervisor ID of the server location
 * `__meta_scaleway_instance_location_node_id`: the node ID of the server location
 * `__meta_scaleway_instance_name`: name of the server
-* `__meta_scaleway_instance_organization`: the organization of the server
+* `__meta_scaleway_instance_organization_id`: the organization of the server
 * `__meta_scaleway_instance_private_ipv4`: the private IPv4 address of the server
 * `__meta_scaleway_instance_project_id`: project id of the server
 * `__meta_scaleway_instance_public_ipv4`: the public IPv4 address of the server