3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 02:09:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

report instance hostname (#2175)

Browse source
This commit is contained in:
wasaga 2021-05-04 17:46:21 -04:00 • committed by GitHub
parent 0071b4e7a5
commit cbaf33032d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/controlplane/xdsmgr/xdsmgr.go
View file

@ -5,6 +5,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
"os"
"sync" "sync"
envoy_service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3" envoy_service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
@ -43,6 +44,8 @@ type Manager struct {
resources map[string][]*envoy_service_discovery_v3.Resource resources map[string][]*envoy_service_discovery_v3.Resource
nonceToConfig *lru.Cache nonceToConfig *lru.Cache
hostname string
} }
// NewManager creates a new Manager. // NewManager creates a new Manager.
@ -56,6 +59,8 @@ func NewManager(resources map[string][]*envoy_service_discovery_v3.Resource, eve
nonceToConfig: nonceToConfig, nonceToConfig: nonceToConfig,
nonce: uuid.NewString(), nonce: uuid.NewString(),
resources: resources, resources: resources,
hostname: getHostname(),
} }
} }
@ -266,6 +271,7 @@ func (mgr *Manager) nonceToConfigVersion(nonce string) (ver uint64) {
func (mgr *Manager) nackEvent(ctx context.Context, req *envoy_service_discovery_v3.DeltaDiscoveryRequest) { func (mgr *Manager) nackEvent(ctx context.Context, req *envoy_service_discovery_v3.DeltaDiscoveryRequest) {
mgr.eventHandler(&events.EnvoyConfigurationEvent{ mgr.eventHandler(&events.EnvoyConfigurationEvent{
Instance: mgr.hostname,
Kind: events.EnvoyConfigurationEvent_EVENT_DISCOVERY_REQUEST, Kind: events.EnvoyConfigurationEvent_EVENT_DISCOVERY_REQUEST,
Time: timestamppb.Now(), Time: timestamppb.Now(),
Message: req.ErrorDetail.Message, Message: req.ErrorDetail.Message,
@ -290,6 +296,7 @@ func (mgr *Manager) nackEvent(ctx context.Context, req *envoy_service_discovery_
func (mgr *Manager) ackEvent(ctx context.Context, req *envoy_service_discovery_v3.DeltaDiscoveryRequest) { func (mgr *Manager) ackEvent(ctx context.Context, req *envoy_service_discovery_v3.DeltaDiscoveryRequest) {
mgr.eventHandler(&events.EnvoyConfigurationEvent{ mgr.eventHandler(&events.EnvoyConfigurationEvent{
Instance: mgr.hostname,
Kind: events.EnvoyConfigurationEvent_EVENT_DISCOVERY_REQUEST, Kind: events.EnvoyConfigurationEvent_EVENT_DISCOVERY_REQUEST,
Time: timestamppb.Now(), Time: timestamppb.Now(),
ConfigVersion: mgr.nonceToConfigVersion(req.ResponseNonce), ConfigVersion: mgr.nonceToConfigVersion(req.ResponseNonce),
@ -309,6 +316,7 @@ func (mgr *Manager) ackEvent(ctx context.Context, req *envoy_service_discovery_v
func (mgr *Manager) changeEvent(ctx context.Context, res *envoy_service_discovery_v3.DeltaDiscoveryResponse) { func (mgr *Manager) changeEvent(ctx context.Context, res *envoy_service_discovery_v3.DeltaDiscoveryResponse) {
mgr.eventHandler(&events.EnvoyConfigurationEvent{ mgr.eventHandler(&events.EnvoyConfigurationEvent{
Instance: mgr.hostname,
Kind: events.EnvoyConfigurationEvent_EVENT_DISCOVERY_RESPONSE, Kind: events.EnvoyConfigurationEvent_EVENT_DISCOVERY_RESPONSE,
Time: timestamppb.Now(), Time: timestamppb.Now(),
ConfigVersion: mgr.nonceToConfigVersion(res.Nonce), ConfigVersion: mgr.nonceToConfigVersion(res.Nonce),
@ -333,3 +341,14 @@ func resourceNames(res []*envoy_service_discovery_v3.Resource) []string {
} }
return txt return txt
} }
func getHostname() string {
hostname, err := os.Hostname()
if err != nil {
hostname = os.Getenv("HOSTNAME")
}
if hostname == "" {
hostname = "__unknown__"
}
return hostname
}