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

Get OpenStack variables from env as fallback (#3293)

Browse source 
This change enables the OpenStack service discovery to read the
authentication parameters from the OS_* environment variables when the
identity endpoint URL is not defined in the Prometheus configuration
file.
This commit is contained in:
pasquier-s 2017-10-16 19:01:50 +02:00 committed by Brian Brazil
parent e948721a0b
commit 88e4815bb7
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
discovery/openstack/openstack.go
View file

@ -19,6 +19,7 @@ import (
"github.com/go-kit/kit/log" "github.com/go-kit/kit/log"
"github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -52,7 +53,15 @@ type Discovery interface {
// NewDiscovery returns a new OpenStackDiscovery which periodically refreshes its targets. // NewDiscovery returns a new OpenStackDiscovery which periodically refreshes its targets.
func NewDiscovery(conf *config.OpenstackSDConfig, l log.Logger) (Discovery, error) { func NewDiscovery(conf *config.OpenstackSDConfig, l log.Logger) (Discovery, error) {
opts := gophercloud.AuthOptions{ var opts gophercloud.AuthOptions
if conf.IdentityEndpoint == "" {
var err error
opts, err = openstack.AuthOptionsFromEnv()
if err != nil {
return nil, err
}
} else {
opts = gophercloud.AuthOptions{
IdentityEndpoint: conf.IdentityEndpoint, IdentityEndpoint: conf.IdentityEndpoint,
Username: conf.Username, Username: conf.Username,
UserID: conf.UserID, UserID: conf.UserID,
@ -62,6 +71,7 @@ func NewDiscovery(conf *config.OpenstackSDConfig, l log.Logger) (Discovery, erro
DomainName: conf.DomainName, DomainName: conf.DomainName,
DomainID: conf.DomainID, DomainID: conf.DomainID,
} }
}
switch conf.Role { switch conf.Role {
case config.OpenStackRoleHypervisor: case config.OpenStackRoleHypervisor:
hypervisor := NewHypervisorDiscovery(&opts, hypervisor := NewHypervisorDiscovery(&opts,