mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

feat: rename status to provisioning_status and add operating_status

Browse source 
Signed-off-by: Paulo Dias <paulodias.gm@gmail.com>
This commit is contained in:
Paulo Dias 2025-01-02 14:43:31 +00:00
parent 713903fe48
commit cb7254158b
No known key found for this signature in database
GPG key ID: CE1937300CB848AA
3 changed files with 54 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
discovery/openstack/loadbalancer.go
View file

@ -33,14 +33,15 @@ import (
) )
const ( const (
openstackLabelLoadBalancerID = openstackLabelPrefix + "loadbalancer_id" openstackLabelLoadBalancerID = openstackLabelPrefix + "loadbalancer_id"
openstackLabelLoadBalancerName = openstackLabelPrefix + "loadbalancer_name" openstackLabelLoadBalancerName = openstackLabelPrefix + "loadbalancer_name"
openstackLabelLoadBalancerStatus = openstackLabelPrefix + "loadbalancer_status" openstackLabelLoadBalancerOperatingStatus = openstackLabelPrefix + "loadbalancer_operating_status"
openstackLabelLoadBalancerAvailabilityZone = openstackLabelPrefix + "loadbalancer_availability_zone" openstackLabelLoadBalancerProvisioningStatus = openstackLabelPrefix + "loadbalancer_provisioning_status"
openstackLabelLoadBalancerFloatingIP = openstackLabelPrefix + "loadbalancer_floating_ip" openstackLabelLoadBalancerAvailabilityZone = openstackLabelPrefix + "loadbalancer_availability_zone"
openstackLabelLoadBalancerVIP = openstackLabelPrefix + "loadbalancer_vip" openstackLabelLoadBalancerFloatingIP = openstackLabelPrefix + "loadbalancer_floating_ip"
openstackLabelLoadBalancerProvider = openstackLabelPrefix + "loadbalancer_provider" openstackLabelLoadBalancerVIP = openstackLabelPrefix + "loadbalancer_vip"
openstackLabelLoadBalancerTags = openstackLabelPrefix + "loadbalancer_tags" openstackLabelLoadBalancerProvider = openstackLabelPrefix + "loadbalancer_provider"
openstackLabelLoadBalancerTags = openstackLabelPrefix + "loadbalancer_tags"
) )
// LoadBalancerDiscovery discovers OpenStack load balancers. // LoadBalancerDiscovery discovers OpenStack load balancers.
@ -174,7 +175,8 @@ func (i *LoadBalancerDiscovery) refresh(ctx context.Context) ([]*targetgroup.Gro
labels[model.AddressLabel] = model.LabelValue(addr) labels[model.AddressLabel] = model.LabelValue(addr)
labels[openstackLabelLoadBalancerID] = model.LabelValue(lb.ID) labels[openstackLabelLoadBalancerID] = model.LabelValue(lb.ID)
labels[openstackLabelLoadBalancerName] = model.LabelValue(lb.Name) labels[openstackLabelLoadBalancerName] = model.LabelValue(lb.Name)
labels[openstackLabelLoadBalancerStatus] = model.LabelValue(lb.ProvisioningStatus) labels[openstackLabelLoadBalancerOperatingStatus] = model.LabelValue(lb.OperatingStatus)
labels[openstackLabelLoadBalancerProvisioningStatus] = model.LabelValue(lb.ProvisioningStatus)
labels[openstackLabelLoadBalancerAvailabilityZone] = model.LabelValue(lb.AvailabilityZone) labels[openstackLabelLoadBalancerAvailabilityZone] = model.LabelValue(lb.AvailabilityZone)
labels[openstackLabelLoadBalancerVIP] = model.LabelValue(lb.VipAddress) labels[openstackLabelLoadBalancerVIP] = model.LabelValue(lb.VipAddress)
labels[openstackLabelLoadBalancerProvider] = model.LabelValue(lb.Provider) labels[openstackLabelLoadBalancerProvider] = model.LabelValue(lb.Provider)

78
discovery/openstack/loadbalancer_test.go
View file

@ -70,49 +70,53 @@ func TestOpenstackSDLoadBalancerRefresh(t *testing.T) {
for i, lbls := range []model.LabelSet{ for i, lbls := range []model.LabelSet{
{ {
"__address__": model.LabelValue("10.0.0.32:9273"), "__address__": model.LabelValue("10.0.0.32:9273"),
"__meta_openstack_loadbalancer_id": model.LabelValue("ef079b0c-e610-4dfb-b1aa-b49f07ac48e5"), "__meta_openstack_loadbalancer_id": model.LabelValue("ef079b0c-e610-4dfb-b1aa-b49f07ac48e5"),
"__meta_openstack_loadbalancer_name": model.LabelValue("lb1"), "__meta_openstack_loadbalancer_name": model.LabelValue("lb1"),
"__meta_openstack_loadbalancer_status": model.LabelValue("ACTIVE"), "__meta_openstack_loadbalancer_operating_status": model.LabelValue("ONLINE"),
"__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az1"), "__meta_openstack_loadbalancer_provisioning_status": model.LabelValue("ACTIVE"),
"__meta_openstack_loadbalancer_floating_ip": model.LabelValue("192.168.1.2"), "__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az1"),
"__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.0.32"), "__meta_openstack_loadbalancer_floating_ip": model.LabelValue("192.168.1.2"),
"__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"), "__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.0.32"),
"__meta_openstack_loadbalancer_tags": model.LabelValue("tag1,tag2"), "__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"),
"__meta_openstack_project_id": model.LabelValue("fcad67a6189847c4aecfa3c81a05783b"), "__meta_openstack_loadbalancer_tags": model.LabelValue("tag1,tag2"),
"__meta_openstack_project_id": model.LabelValue("fcad67a6189847c4aecfa3c81a05783b"),
}, },
{ {
"__address__": model.LabelValue("10.0.2.78:8080"), "__address__": model.LabelValue("10.0.2.78:8080"),
"__meta_openstack_loadbalancer_id": model.LabelValue("d92c471e-8d3e-4b9f-b2b5-9c72a9e3ef54"), "__meta_openstack_loadbalancer_id": model.LabelValue("d92c471e-8d3e-4b9f-b2b5-9c72a9e3ef54"),
"__meta_openstack_loadbalancer_name": model.LabelValue("lb3"), "__meta_openstack_loadbalancer_name": model.LabelValue("lb3"),
"__meta_openstack_loadbalancer_status": model.LabelValue("ACTIVE"), "__meta_openstack_loadbalancer_operating_status": model.LabelValue("ONLINE"),
"__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az3"), "__meta_openstack_loadbalancer_provisioning_status": model.LabelValue("ACTIVE"),
"__meta_openstack_loadbalancer_floating_ip": model.LabelValue("192.168.3.4"), "__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az3"),
"__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.2.78"), "__meta_openstack_loadbalancer_floating_ip": model.LabelValue("192.168.3.4"),
"__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"), "__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.2.78"),
"__meta_openstack_loadbalancer_tags": model.LabelValue("tag5,tag6"), "__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"),
"__meta_openstack_project_id": model.LabelValue("ac57f03dba1a4fdebff3e67201bc7a85"), "__meta_openstack_loadbalancer_tags": model.LabelValue("tag5,tag6"),
"__meta_openstack_project_id": model.LabelValue("ac57f03dba1a4fdebff3e67201bc7a85"),
}, },
{ {
"__address__": model.LabelValue("10.0.3.99:9090"), "__address__": model.LabelValue("10.0.3.99:9090"),
"__meta_openstack_loadbalancer_id": model.LabelValue("f5c7e918-df38-4a5a-a7d4-d9c27ab2cf67"), "__meta_openstack_loadbalancer_id": model.LabelValue("f5c7e918-df38-4a5a-a7d4-d9c27ab2cf67"),
"__meta_openstack_loadbalancer_name": model.LabelValue("lb4"), "__meta_openstack_loadbalancer_name": model.LabelValue("lb4"),
"__meta_openstack_loadbalancer_status": model.LabelValue("ACTIVE"), "__meta_openstack_loadbalancer_operating_status": model.LabelValue("ONLINE"),
"__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az1"), "__meta_openstack_loadbalancer_provisioning_status": model.LabelValue("ACTIVE"),
"__meta_openstack_loadbalancer_floating_ip": model.LabelValue("192.168.4.5"), "__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az1"),
"__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.3.99"), "__meta_openstack_loadbalancer_floating_ip": model.LabelValue("192.168.4.5"),
"__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"), "__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.3.99"),
"__meta_openstack_project_id": model.LabelValue("fa8c372dfe4d4c92b0c4e3a2d9b3c9fa"), "__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"),
"__meta_openstack_project_id": model.LabelValue("fa8c372dfe4d4c92b0c4e3a2d9b3c9fa"),
}, },
{ {
"__address__": model.LabelValue("10.0.4.88:9876"), "__address__": model.LabelValue("10.0.4.88:9876"),
"__meta_openstack_loadbalancer_id": model.LabelValue("e83a6d92-7a3e-4567-94b3-20c83b32a75e"), "__meta_openstack_loadbalancer_id": model.LabelValue("e83a6d92-7a3e-4567-94b3-20c83b32a75e"),
"__meta_openstack_loadbalancer_name": model.LabelValue("lb5"), "__meta_openstack_loadbalancer_name": model.LabelValue("lb5"),
"__meta_openstack_loadbalancer_status": model.LabelValue("ACTIVE"), "__meta_openstack_loadbalancer_operating_status": model.LabelValue("ONLINE"),
"__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az4"), "__meta_openstack_loadbalancer_provisioning_status": model.LabelValue("ACTIVE"),
"__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.4.88"), "__meta_openstack_loadbalancer_availability_zone": model.LabelValue("az4"),
"__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"), "__meta_openstack_loadbalancer_vip": model.LabelValue("10.0.4.88"),
"__meta_openstack_project_id": model.LabelValue("a5d3b2e1e6f34cd9a5f7c2f01a6b8e29"), "__meta_openstack_loadbalancer_provider": model.LabelValue("amphora"),
"__meta_openstack_project_id": model.LabelValue("a5d3b2e1e6f34cd9a5f7c2f01a6b8e29"),
}, },
} { } {
t.Run(fmt.Sprintf("item %d", i), func(t *testing.T) { t.Run(fmt.Sprintf("item %d", i), func(t *testing.T) {

2
docs/configuration/configuration.md
View file

@ -1209,6 +1209,8 @@ The following meta labels are available on targets during [relabeling](#relabel_
* `__meta_openstack_loadbalancer_name`: the OpenStack load balancer name. * `__meta_openstack_loadbalancer_name`: the OpenStack load balancer name.
* `__meta_openstack_loadbalancer_provider`: the Octavia provider of the OpenStack load balancer. * `__meta_openstack_loadbalancer_provider`: the Octavia provider of the OpenStack load balancer.
* `__meta_openstack_loadbalancer_status`: the status of the OpenStack load balancer. * `__meta_openstack_loadbalancer_status`: the status of the OpenStack load balancer.
* `__meta_openstack_loadbalancer_operating_status`: the operating status of the OpenStack load balancer.
* `__meta_openstack_loadbalancer_provisioning_status`: the provisioning status of the OpenStack load balancer.
* `__meta_openstack_loadbalancer_tags`: comma separated list of the OpenStack load balancer. * `__meta_openstack_loadbalancer_tags`: comma separated list of the OpenStack load balancer.
* `__meta_openstack_loadbalancer_vip`: the VIP of the OpenStack load balancer. * `__meta_openstack_loadbalancer_vip`: the VIP of the OpenStack load balancer.
* `__meta_openstack_project_id`: the project (tenant) owning this load balancer. * `__meta_openstack_project_id`: the project (tenant) owning this load balancer.