From 1487e71eb47a74dce453e50bc5d919877e0a9a39 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 4 Aug 2023 10:35:16 +0100 Subject: [PATCH 01/49] Collect fan status information for EX series switches --- pkg/features/environment/collector.go | 11 ++ pkg/features/environment/rpc_test.go | 193 ++++++++++++++++++++++++++ 2 files changed, 204 insertions(+) diff --git a/pkg/features/environment/collector.go b/pkg/features/environment/collector.go index f955eb3a..100c4931 100644 --- a/pkg/features/environment/collector.go +++ b/pkg/features/environment/collector.go @@ -18,6 +18,8 @@ const prefix string = "junos_environment_" var ( temperaturesDesc *prometheus.Desc powerSupplyDesc *prometheus.Desc + fanStatusDesc *prometheus.Desc + fanAirflowDesc *prometheus.Desc pemDesc *prometheus.Desc fanDesc *prometheus.Desc dcVoltageDesc *prometheus.Desc @@ -30,6 +32,8 @@ func init() { l := []string{"target", "re_name", "item"} temperaturesDesc = prometheus.NewDesc(prefix+"item_temp", "Temperature of the air flowing past", l, nil) powerSupplyDesc = prometheus.NewDesc(prefix+"power_up", "Status of power supplies (1 OK, 2 Testing, 3 Failed, 4 Absent, 5 Present)", append(l, "status"), nil) + fanStatusDesc = prometheus.NewDesc(prefix+"fan_up", "Status of fans (1 OK, 2 Testing, 3 Failed, 4 Absent, 5 Present)", append(l, "status"), nil) + fanAirflowDesc = prometheus.NewDesc(prefix+"fan_airflow_up", "Status of fan airflows (1 OK, 2 Testing, 3 Failed, 4 Absent, 5 Present)", append(l, "status"), nil) pemDesc = prometheus.NewDesc(prefix+"pem_state", "State of PEM module. 1 - Online, 2 - Present, 3 - Empty", append(l, "state"), nil) dcVoltageDesc = prometheus.NewDesc(prefix+"pem_voltage", "PEM voltage value", l, nil) @@ -113,6 +117,13 @@ func (c *environmentCollector) environmentItems(client collector.Client, ch chan if strings.Contains(item.Name, "Power Supply") || strings.Contains(item.Name, "PEM") { l = append(l, item.Name, item.Status) ch <- prometheus.MustNewConstMetric(powerSupplyDesc, prometheus.GaugeValue, float64(statusValues[item.Status]), l...) + } else if strings.Contains(item.Name, "Fan") { + l = append(l, item.Name, item.Status) + if strings.Contains(item.Name, "Airflow") { + ch <- prometheus.MustNewConstMetric(fanAirflowDesc, prometheus.GaugeValue, float64(statusValues[item.Status]), l...) + } else { + ch <- prometheus.MustNewConstMetric(fanStatusDesc, prometheus.GaugeValue, float64(statusValues[item.Status]), l...) + } } else if item.Temperature != nil { l = append(l, item.Name) ch <- prometheus.MustNewConstMetric(temperaturesDesc, prometheus.GaugeValue, item.Temperature.Value, l...) diff --git a/pkg/features/environment/rpc_test.go b/pkg/features/environment/rpc_test.go index 23990d9e..bc1d125d 100644 --- a/pkg/features/environment/rpc_test.go +++ b/pkg/features/environment/rpc_test.go @@ -428,3 +428,196 @@ func TestParseMultiREOutputSRX(t *testing.T) { assert.Equal(t, "Power Supply 1", f.Name, "name") assert.Equal(t, "OK", f.Status, "status") } + +func TestParseNoMultiREOutputEX(t *testing.T) { + body := ` + + + FPC 0 Power Supply 0 + Power + OK + + + FPC 0 Power Supply 1 + Power + OK + + + FPC 1 Power Supply 0 + Power + OK + + + FPC 1 Power Supply 1 + Power + OK + + + FPC 0 CPU + Temp + OK + 65 degrees C / 149 degrees F + + + FPC 0 NW-PFE + Temp + OK + 48 degrees C / 118 degrees F + + + FPC 0 SE-PFE + Temp + OK + 49 degrees C / 120 degrees F + + + FPC 0 PHY-2/3 + Temp + OK + 48 degrees C / 118 degrees F + + + FPC 0 MGMT PHY + Temp + OK + 47 degrees C / 116 degrees F + + + FPC 0 PHY-4/5 + Temp + OK + 50 degrees C / 122 degrees F + + + FPC 1 CPU + Temp + OK + 65 degrees C / 149 degrees F + + + FPC 1 NW-PFE + Temp + OK + 46 degrees C / 114 degrees F + + + FPC 1 SE-PFE + Temp + OK + 48 degrees C / 118 degrees F + + + FPC 1 PHY-2/3 + Temp + OK + 48 degrees C / 118 degrees F + + + FPC 1 MGMT PHY + Temp + OK + 46 degrees C / 114 degrees F + + + FPC 1 PHY-4/5 + Temp + OK + 47 degrees C / 116 degrees F + + + FPC 0 Fan 0 + Fans + OK + Spinning at normal speed + + + FPC 0 Fan 0 Airflow + Fans + OK + Airflow Out (AFO) + + + FPC 0 Fan 1 + Fans + OK + Spinning at normal speed + + + FPC 0 Fan 1 Airflow + Fans + OK + Airflow Out (AFO) + + + FPC 1 Fan 0 + Fans + OK + Spinning at normal speed + + + FPC 1 Fan 0 Airflow + Fans + OK + Airflow Out (AFO) + + + FPC 1 Fan 1 + Fans + OK + Spinning at normal speed + + + FPC 1 Fan 1 Airflow + Fans + OK + Airflow Out (AFO) + + + + {master:0} + +` + + rpc := multiEngineResult{} + err := parseXML([]byte(body), &rpc) + + if err != nil { + t.Fatal(err) + } + + assert.NotEmpty(t, rpc.Results.RoutingEngines[0].EnvironmentInformation) + + assert.Equal(t, "N/A", rpc.Results.RoutingEngines[0].Name, "re-name") + + f := rpc.Results.RoutingEngines[0].EnvironmentInformation.Items[0] + + assert.Equal(t, "FPC 0 Power Supply 0", f.Name, "name") + assert.Equal(t, "OK", f.Status, "status") + + f = rpc.Results.RoutingEngines[0].EnvironmentInformation.Items[3] + + assert.Equal(t, "FPC 1 Power Supply 1", f.Name, "name") + assert.Equal(t, "OK", f.Status, "status") + + f = rpc.Results.RoutingEngines[0].EnvironmentInformation.Items[4] + + assert.Equal(t, "FPC 0 CPU", f.Name, "name") + assert.Equal(t, "OK", f.Status, "status") + assert.Equal(t, float64(65), f.Temperature.Value, "temperature") + + f = rpc.Results.RoutingEngines[0].EnvironmentInformation.Items[15] + + assert.Equal(t, "FPC 1 PHY-4/5", f.Name, "name") + assert.Equal(t, "OK", f.Status, "status") + assert.Equal(t, float64(47), f.Temperature.Value, "temperature") + + f = rpc.Results.RoutingEngines[0].EnvironmentInformation.Items[16] + + assert.Equal(t, "FPC 0 Fan 0", f.Name, "name") + assert.Equal(t, "OK", f.Status, "status") + + f = rpc.Results.RoutingEngines[0].EnvironmentInformation.Items[23] + + assert.Equal(t, "FPC 1 Fan 1 Airflow", f.Name, "name") + assert.Equal(t, "OK", f.Status, "status") +} From 30ff477156e717e25a87c44488343dab0e4abad4 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 13 Sep 2023 12:37:27 +0200 Subject: [PATCH 02/49] scraping of subscribers -> new metric: junos_subscriber_info --- README.md | 2 +- collectors.go | 2 ++ internal/config/config.go | 1 + main.go | 3 +- pkg/features/subscriber/collector.go | 48 ++++++++++++++++++++++++++++ pkg/features/subscriber/rpc.go | 14 ++++++++ 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 pkg/features/subscriber/collector.go create mode 100644 pkg/features/subscriber/rpc.go diff --git a/README.md b/README.md index 6da6f1d3..141eaf83 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ The following metrics are supported by now: * L2circuits (tunnel state, number of tunnels) * LDP (number of neighbors, sessions and session states) * VRRP (state per interface) - +* Subscribers Information (show subscribers client-type dhcp detail) ## Feature specific mappings Some collected time series behave like enums - Integer values represent a certain state/meaning. diff --git a/collectors.go b/collectors.go index 2b9d1e20..8ef5c2b5 100644 --- a/collectors.go +++ b/collectors.go @@ -34,6 +34,7 @@ import ( "github.com/czerwonk/junos_exporter/pkg/features/security" "github.com/czerwonk/junos_exporter/pkg/features/securitypolicies" "github.com/czerwonk/junos_exporter/pkg/features/storage" + "github.com/czerwonk/junos_exporter/pkg/features/subscriber" "github.com/czerwonk/junos_exporter/pkg/features/system" "github.com/czerwonk/junos_exporter/pkg/features/vpws" "github.com/czerwonk/junos_exporter/pkg/features/vrrp" @@ -112,6 +113,7 @@ func (c *collectors) initCollectorsForDevices(device *connector.Device) { c.addCollectorIfEnabledForDevice(device, "vrrp", f.VRRP, vrrp.NewCollector) c.addCollectorIfEnabledForDevice(device, "vpws", f.VPWS, vpws.NewCollector) c.addCollectorIfEnabledForDevice(device, "mpls_lsp", f.MPLSLSP, mplslsp.NewCollector) + c.addCollectorIfEnabledForDevice(device, "subscriber", f.Subscriber, subscriber.NewCollector) } func (c *collectors) addCollectorIfEnabledForDevice(device *connector.Device, key string, enabled bool, newCollector func() collector.RPCCollector) { diff --git a/internal/config/config.go b/internal/config/config.go index fdd5cd23..c7bf82f4 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -66,6 +66,7 @@ type FeatureConfig struct { VPWS bool `yaml:"vpws,omitempty"` VRRP bool `yaml:"vrrp,omitempty"` License bool `yaml:"license,omitempty"` + Subscriber bool `yaml:"subscriber,omitempty"` } // New creates a new config diff --git a/main.go b/main.go index 4ef70a6f..b9d8be7d 100644 --- a/main.go +++ b/main.go @@ -86,6 +86,7 @@ var ( connManager *connector.SSHConnectionManager reloadCh chan chan error configMu sync.RWMutex + subscriberEnabled = flag.Bool("subscriber.enabled", false, "Scrape subscribers detail") ) func init() { @@ -244,7 +245,7 @@ func loadConfigFromFlags() *config.Config { f.VPWS = *vpwsEnabled f.MPLSLSP = *mplsLSPEnabled f.License = *licenseEnabled - + f.Subscriber = *subscriberEnabled return c } diff --git a/pkg/features/subscriber/collector.go b/pkg/features/subscriber/collector.go new file mode 100644 index 00000000..c8c104b2 --- /dev/null +++ b/pkg/features/subscriber/collector.go @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: MIT + +package subscriber + +import ( + "github.com/czerwonk/junos_exporter/pkg/collector" + "github.com/prometheus/client_golang/prometheus" +) + +const prefix string = "junos_subscriber_info" + +var subscriberInfo *prometheus.Desc + +func init() { + l := []string{"target", "interface", "agent_circuit_id", "agent_remote_id"} + subscriberInfo = prometheus.NewDesc(prefix+"", "Subscriber Detail", l, nil) +} + +// Name implements collector.RPCCollector. +func (*subcsribers_information) Name() string { + return "Subscriber Detail" +} + +// NewCollector creates a new collector +func NewCollector() collector.RPCCollector { + return &subcsribers_information{} +} + +// Describe describes the metrics +func (*subcsribers_information) Describe(ch chan<- *prometheus.Desc) { + ch <- subscriberInfo +} + +// Collect collects metrics from JunOS +func (c *subcsribers_information) Collect(client collector.Client, ch chan<- prometheus.Metric, labelValues []string) error { + var x = subcsribers_information{} + err := client.RunCommandAndParse("show subscribers client-type dhcp detail", &x) + if err != nil { + return err + } + + for _, subscriber := range x.SubscribersInformation.Subscriber { + labels := append(labelValues, subscriber.Interface, subscriber.AgentCircuitId, subscriber.AgentRemoteId) + ch <- prometheus.MustNewConstMetric(subscriberInfo, prometheus.CounterValue, 1, labels...) + } + + return nil +} diff --git a/pkg/features/subscriber/rpc.go b/pkg/features/subscriber/rpc.go new file mode 100644 index 00000000..8fb028b1 --- /dev/null +++ b/pkg/features/subscriber/rpc.go @@ -0,0 +1,14 @@ +package subscriber + +type subcsribers_information struct { + SubscribersInformation struct { + Subscriber []subscriber `xml:"subscriber"` + } `xml:"subscribers-information"` +} + +type subscriber struct { + AccessType string `xml:"access-type"` + Interface string `xml:"interface"` + AgentCircuitId string `xml:"agent-circuit-id"` + AgentRemoteId string `xml:"agent-remote-id"` +} From 659ce4c143faab8bf2e7f701fbb1eb7b0490ddbb Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Mon, 18 Sep 2023 13:14:40 +0200 Subject: [PATCH 03/49] fix BGP group label for old EX devices, add info label with filter pollicy, add metrics for MED, pref and hold time --- .gitignore | 3 +- main.go | 2 +- pkg/features/bgp/collector.go | 96 ++++++++++++++++++++++++----------- pkg/features/bgp/helper.go | 38 ++++++++++++++ pkg/features/bgp/rpc.go | 33 ++++++++---- 5 files changed, 129 insertions(+), 43 deletions(-) create mode 100644 pkg/features/bgp/helper.go diff --git a/.gitignore b/.gitignore index eb990b14..d69d9317 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ config.yml artifacts config/tests/config_local.yml .vscode* -notes.txt \ No newline at end of file +notes.txt +.DS_Store/ diff --git a/main.go b/main.go index 4ef70a6f..670e7cca 100644 --- a/main.go +++ b/main.go @@ -24,7 +24,7 @@ import ( log "github.com/sirupsen/logrus" ) -const version string = "0.11.0" +const version string = "0.12.0" var ( showVersion = flag.Bool("version", false, "Print version information.") diff --git a/pkg/features/bgp/collector.go b/pkg/features/bgp/collector.go index c9c3b96d..7d31ba7c 100644 --- a/pkg/features/bgp/collector.go +++ b/pkg/features/bgp/collector.go @@ -3,7 +3,9 @@ package bgp import ( + "fmt" "math" + "strconv" "github.com/czerwonk/junos_exporter/pkg/collector" "github.com/prometheus/client_golang/prometheus" @@ -26,6 +28,10 @@ var ( flapsDesc *prometheus.Desc prefixesLimitCountDesc *prometheus.Desc prefixesLimitPercentageDesc *prometheus.Desc + infoDesc *prometheus.Desc + medDesc *prometheus.Desc + preferenceDesc *prometheus.Desc + holdTimeDesc *prometheus.Desc ) func init() { @@ -35,6 +41,12 @@ func init() { inputMessagesDesc = prometheus.NewDesc(prefix+"messages_input_count", "Number of received messages", l, nil) outputMessagesDesc = prometheus.NewDesc(prefix+"messages_output_count", "Number of transmitted messages", l, nil) flapsDesc = prometheus.NewDesc(prefix+"flap_count", "Number of session flaps", l, nil) + medDesc = prometheus.NewDesc(prefix+"metric_out", "MED configured for the session", l, nil) + preferenceDesc = prometheus.NewDesc(prefix+"preference", "Preference configured for the session", l, nil) + holdTimeDesc = prometheus.NewDesc(prefix+"hold_time_seconds", "Hold time configured for the session", l, nil) + + infoLabels := append(l, "local_as", "import_policy", "export_policy") + infoDesc = prometheus.NewDesc(prefix+"info", "Information about the session (e.g. configuration)", infoLabels, nil) l = append(l, "table") @@ -51,6 +63,8 @@ type bgpCollector struct { LogicalSystem string } +type groupMap map[int64]group + // NewCollector creates a new collector func NewCollector(logicalSystem string) collector.RPCCollector { return &bgpCollector{LogicalSystem: logicalSystem} @@ -74,6 +88,10 @@ func (*bgpCollector) Describe(ch chan<- *prometheus.Desc) { ch <- flapsDesc ch <- prefixesLimitCountDesc ch <- prefixesLimitPercentageDesc + ch <- infoDesc + ch <- medDesc + ch <- preferenceDesc + ch <- holdTimeDesc } // Collect collects metrics from JunOS @@ -86,7 +104,33 @@ func (c *bgpCollector) Collect(client collector.Client, ch chan<- prometheus.Met return nil } +func (c *bgpCollector) collectGroups(client collector.Client) (groupMap, error) { + var x = groupResult{} + var cmd strings.Builder + cmd.WriteString("show bgp group") + if c.LogicalSystem != "" { + cmd.WriteString(" logical-system " + c.LogicalSystem) + } + + err := client.RunCommandAndParse(cmd.String(), &x) + if err != nil { + return nil, err + } + + groups := make(groupMap) + for _, g := range x.Information.Groups { + groups[g.Index] = g + } + + return groups, err +} + func (c *bgpCollector) collect(client collector.Client, ch chan<- prometheus.Metric, labelValues []string) error { + groups, err := c.collectGroups(client) + if err != nil { + return fmt.Errorf("could not retrieve BGP group information: %w", err) + } + var x = result{} var cmd strings.Builder cmd.WriteString("show bgp neighbor") @@ -94,21 +138,25 @@ func (c *bgpCollector) collect(client collector.Client, ch chan<- prometheus.Met cmd.WriteString(" logical-system " + c.LogicalSystem) } - err := client.RunCommandAndParse(cmd.String(), &x) + err = client.RunCommandAndParse(cmd.String(), &x) if err != nil { return err } for _, peer := range x.Information.Peers { - c.collectForPeer(peer, ch, labelValues) + c.collectForPeer(peer, groups, ch, labelValues) } return nil } -func (c *bgpCollector) collectForPeer(p peer, ch chan<- prometheus.Metric, labelValues []string) { +func (c *bgpCollector) collectForPeer(p peer, groups groupMap, ch chan<- prometheus.Metric, labelValues []string) { ip := strings.Split(p.IP, "+") - l := append(labelValues, []string{p.ASN, ip[0], p.Description, p.Group}...) + l := append(labelValues, []string{ + p.ASN, + ip[0], + p.Description, + groupForPeer(p, groups)}...) up := 0 if p.State == "Established" { @@ -120,6 +168,15 @@ func (c *bgpCollector) collectForPeer(p peer, ch chan<- prometheus.Metric, label ch <- prometheus.MustNewConstMetric(inputMessagesDesc, prometheus.GaugeValue, float64(p.InputMessages), l...) ch <- prometheus.MustNewConstMetric(outputMessagesDesc, prometheus.GaugeValue, float64(p.OutputMessages), l...) ch <- prometheus.MustNewConstMetric(flapsDesc, prometheus.GaugeValue, float64(p.Flaps), l...) + ch <- prometheus.MustNewConstMetric(preferenceDesc, prometheus.GaugeValue, float64(p.OptionInformation.Preference), l...) + ch <- prometheus.MustNewConstMetric(medDesc, prometheus.GaugeValue, float64(p.OptionInformation.MetricOut), l...) + ch <- prometheus.MustNewConstMetric(holdTimeDesc, prometheus.GaugeValue, float64(p.OptionInformation.Holdtime), l...) + + infoValues := append(l, + strconv.FormatInt(p.OptionInformation.LocalAs, 10), + formatPolicy(p.OptionInformation.ImportPolicy), + formatPolicy(p.OptionInformation.ExportPolicy)) + ch <- prometheus.MustNewConstMetric(infoDesc, prometheus.GaugeValue, 1, infoValues...) c.collectRIBForPeer(p, ch, l) } @@ -128,7 +185,7 @@ func (*bgpCollector) collectRIBForPeer(p peer, ch chan<- prometheus.Metric, labe var rib_name string // derive the name of the rib for which the prefix limit is configured by examining the NLRI type - switch nlri_type := p.BGPOI.PrefixLimit.NlriType; nlri_type { + switch nlri_type := p.OptionInformation.PrefixLimit.NlriType; nlri_type { case "inet-unicast": rib_name = "inet.0" case "inet6-unicast": @@ -142,8 +199,8 @@ func (*bgpCollector) collectRIBForPeer(p peer, ch chan<- prometheus.Metric, labe rib_name = p.CFGRTI + "." + rib_name } - if p.BGPOI.PrefixLimit.PrefixCount > 0 { - ch <- prometheus.MustNewConstMetric(prefixesLimitCountDesc, prometheus.GaugeValue, float64(p.BGPOI.PrefixLimit.PrefixCount), append(labelValues, rib_name)...) + if p.OptionInformation.PrefixLimit.PrefixCount > 0 { + ch <- prometheus.MustNewConstMetric(prefixesLimitCountDesc, prometheus.GaugeValue, float64(p.OptionInformation.PrefixLimit.PrefixCount), append(labelValues, rib_name)...) } for _, rib := range p.RIBs { @@ -155,31 +212,10 @@ func (*bgpCollector) collectRIBForPeer(p peer, ch chan<- prometheus.Metric, labe ch <- prometheus.MustNewConstMetric(advertisedPrefixesDesc, prometheus.GaugeValue, float64(rib.AdvertisedPrefixes), l...) if rib.Name == rib_name { - if p.BGPOI.PrefixLimit.PrefixCount > 0 { - prefixesLimitPercent := float64(rib.ReceivedPrefixes) / float64(p.BGPOI.PrefixLimit.PrefixCount) + if p.OptionInformation.PrefixLimit.PrefixCount > 0 { + prefixesLimitPercent := float64(rib.ReceivedPrefixes) / float64(p.OptionInformation.PrefixLimit.PrefixCount) ch <- prometheus.MustNewConstMetric(prefixesLimitPercentageDesc, prometheus.GaugeValue, math.Round(prefixesLimitPercent*100)/100, l...) } } } } - -func bgpStateToNumber(bgpState string) float64 { - switch bgpState { - case "Active": - return 1 - case "Connect": - return 2 - case "Established": - return 3 - case "Idle": - return 4 - case "Openconfirm": - return 5 - case "OpenSent": - return 6 - case "route reflector client": - return 7 - default: - return 0 - } -} diff --git a/pkg/features/bgp/helper.go b/pkg/features/bgp/helper.go new file mode 100644 index 00000000..0b99f452 --- /dev/null +++ b/pkg/features/bgp/helper.go @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: MIT + +package bgp + +import "strings" + +func groupForPeer(p peer, groups groupMap) string { + if len(p.Group) > 0 { + return p.Group + } + + return groups[p.GroupIndex].Name +} + +func formatPolicy(s string) string { + return strings.Trim(s, "\n ") +} + +func bgpStateToNumber(bgpState string) float64 { + switch bgpState { + case "Active": + return 1 + case "Connect": + return 2 + case "Established": + return 3 + case "Idle": + return 4 + case "Openconfirm": + return 5 + case "OpenSent": + return 6 + case "route reflector client": + return 7 + default: + return 0 + } +} diff --git a/pkg/features/bgp/rpc.go b/pkg/features/bgp/rpc.go index 784a5c80..b3d8d3ac 100644 --- a/pkg/features/bgp/rpc.go +++ b/pkg/features/bgp/rpc.go @@ -9,17 +9,18 @@ type result struct { } type peer struct { - CFGRTI string `xml:"peer-cfg-rti"` - IP string `xml:"peer-address"` - ASN string `xml:"peer-as"` - State string `xml:"peer-state"` - Group string `xml:"peer-group"` - Description string `xml:"description"` - Flaps int64 `xml:"flap-count"` - InputMessages int64 `xml:"input-messages"` - OutputMessages int64 `xml:"output-messages"` - RIBs []rib `xml:"bgp-rib"` - BGPOI optionInformation `xml:"bgp-option-information"` + CFGRTI string `xml:"peer-cfg-rti"` + IP string `xml:"peer-address"` + ASN string `xml:"peer-as"` + State string `xml:"peer-state"` + Group string `xml:"peer-group"` + GroupIndex int64 `xml:"peer-group-index"` + Description string `xml:"description"` + Flaps int64 `xml:"flap-count"` + InputMessages int64 `xml:"input-messages"` + OutputMessages int64 `xml:"output-messages"` + RIBs []rib `xml:"bgp-rib"` + OptionInformation optionInformation `xml:"bgp-option-information"` } type rib struct { @@ -50,3 +51,13 @@ type prefixLimit struct { LimitAction string `xml:"limit-action"` WarningPercentage int64 `xml:"warning-percentage"` } + +type groupResult struct { + Information struct { + Groups []group `xml:"bgp-group"` + } `xml:"bgp-group-information"` +} +type group struct { + Index int64 `xml:"group-index"` + Name string `xml:"name"` +} From 80a0f1fe6a72eab1ebbcd2556c21b087c2c7d331 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Mon, 18 Sep 2023 13:32:18 +0200 Subject: [PATCH 04/49] use system ASN if local ASN is not configured on session --- main.go | 2 +- pkg/features/bgp/collector.go | 3 +-- pkg/features/bgp/helper.go | 13 ++++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 670e7cca..773ee5bd 100644 --- a/main.go +++ b/main.go @@ -24,7 +24,7 @@ import ( log "github.com/sirupsen/logrus" ) -const version string = "0.12.0" +const version string = "0.12.1" var ( showVersion = flag.Bool("version", false, "Print version information.") diff --git a/pkg/features/bgp/collector.go b/pkg/features/bgp/collector.go index 7d31ba7c..df3b58cc 100644 --- a/pkg/features/bgp/collector.go +++ b/pkg/features/bgp/collector.go @@ -5,7 +5,6 @@ package bgp import ( "fmt" "math" - "strconv" "github.com/czerwonk/junos_exporter/pkg/collector" "github.com/prometheus/client_golang/prometheus" @@ -173,7 +172,7 @@ func (c *bgpCollector) collectForPeer(p peer, groups groupMap, ch chan<- prometh ch <- prometheus.MustNewConstMetric(holdTimeDesc, prometheus.GaugeValue, float64(p.OptionInformation.Holdtime), l...) infoValues := append(l, - strconv.FormatInt(p.OptionInformation.LocalAs, 10), + localASNForPeer(p), formatPolicy(p.OptionInformation.ImportPolicy), formatPolicy(p.OptionInformation.ExportPolicy)) ch <- prometheus.MustNewConstMetric(infoDesc, prometheus.GaugeValue, 1, infoValues...) diff --git a/pkg/features/bgp/helper.go b/pkg/features/bgp/helper.go index 0b99f452..7bf120dc 100644 --- a/pkg/features/bgp/helper.go +++ b/pkg/features/bgp/helper.go @@ -2,7 +2,10 @@ package bgp -import "strings" +import ( + "strconv" + "strings" +) func groupForPeer(p peer, groups groupMap) string { if len(p.Group) > 0 { @@ -36,3 +39,11 @@ func bgpStateToNumber(bgpState string) float64 { return 0 } } + +func localASNForPeer(p peer) string { + if p.OptionInformation.LocalAs > 0 { + return strconv.FormatInt(p.OptionInformation.LocalAs, 10) + } + + return strconv.FormatInt(p.OptionInformation.LocalSystemAs, 10) +} From e5388feabb673da36b85c7ebb63ff768047a2da0 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Wed, 20 Sep 2023 14:39:33 +0200 Subject: [PATCH 05/49] remove unused parameter --- .../interfacediagnostics/collector.go | 110 +----------------- pkg/features/interfacediagnostics/helper.go | 105 +++++++++++++++++ 2 files changed, 111 insertions(+), 104 deletions(-) create mode 100644 pkg/features/interfacediagnostics/helper.go diff --git a/pkg/features/interfacediagnostics/collector.go b/pkg/features/interfacediagnostics/collector.go index d4ae6289..ae59fcaa 100644 --- a/pkg/features/interfacediagnostics/collector.go +++ b/pkg/features/interfacediagnostics/collector.go @@ -6,8 +6,6 @@ import ( "encoding/xml" "fmt" "log" - "math" - "strconv" "strings" "github.com/czerwonk/junos_exporter/pkg/interfacelabels" @@ -201,7 +199,6 @@ func (c *interfaceDiagnosticsCollector) Collect(client collector.Client, ch chan diagnostics_dict := make(map[string]*interfaceDiagnostics) for _, d := range diagnostics { - index := strings.Split(d.Name, "-")[1] diagnostics_dict[index] = d @@ -264,10 +261,11 @@ func (c *interfaceDiagnosticsCollector) Collect(client collector.Client, ch chan } } - err = createTransceiverMetrics(c, client, diagnostics_dict, ch, labelValues) + err = c.createTransceiverMetrics(client, ch, labelValues) if err != nil { return err } + return nil } @@ -282,7 +280,6 @@ func (c *interfaceDiagnosticsCollector) interfaceMediaInfo(client collector.Clie } func interfaceMediaInfoFromRPCResult(interfaceMediaList *[]physicalInterface) map[string]*physicalInterface { - interfaceMediaDict := make(map[string]*physicalInterface) for _, i := range *interfaceMediaList { @@ -292,6 +289,7 @@ func interfaceMediaInfoFromRPCResult(interfaceMediaList *[]physicalInterface) ma interfaceMediaDict[slotIndex] = &iface } } + return interfaceMediaDict } @@ -338,6 +336,7 @@ func (c *interfaceDiagnosticsCollector) transceiverInfoFromRPCResult(client coll } } } + return transceiverList, nil } @@ -352,8 +351,7 @@ func (c *interfaceDiagnosticsCollector) getPicPortsFromRPCResult(client collecto return x.FPCInformation.FPC.PicDetail.PicPortInfoList, nil } -func createTransceiverMetrics(c *interfaceDiagnosticsCollector, client collector.Client, diagnostics_dict map[string]*interfaceDiagnostics, ch chan<- prometheus.Metric, labelValues []string) error { - +func (c *interfaceDiagnosticsCollector) createTransceiverMetrics(client collector.Client, ch chan<- prometheus.Metric, labelValues []string) error { ifMediaDict, err := c.interfaceMediaInfo(client) if err != nil { return err @@ -383,6 +381,7 @@ func createTransceiverMetrics(c *interfaceDiagnosticsCollector, client collector ch <- prometheus.MustNewConstMetric(c.transceiverDesc, prometheus.GaugeValue, oper_status, transceiver_labels...) } + return nil } @@ -452,100 +451,3 @@ func (c *interfaceDiagnosticsCollector) interfaceDiagnostics(client collector.Cl return interfaceDiagnosticsFromRPCResult(x), nil } - -func interfaceDiagnosticsFromRPCResult(res result) []*interfaceDiagnostics { - diagnostics := make([]*interfaceDiagnostics, 0) - - for _, diag := range res.Information.Diagnostics { - if diag.Diagnostics.NA == "N/A" { - continue - } - - d := &interfaceDiagnostics{ - Index: "", - Name: diag.Name, - LaserBiasCurrent: float64(diag.Diagnostics.LaserBiasCurrent), - LaserBiasCurrentHighAlarmThreshold: float64(diag.Diagnostics.LaserBiasCurrentHighAlarmThreshold), - LaserBiasCurrentLowAlarmThreshold: float64(diag.Diagnostics.LaserBiasCurrentLowAlarmThreshold), - LaserBiasCurrentHighWarnThreshold: float64(diag.Diagnostics.LaserBiasCurrentHighWarnThreshold), - LaserBiasCurrentLowWarnThreshold: float64(diag.Diagnostics.LaserBiasCurrentLowWarnThreshold), - - LaserOutputPower: float64(diag.Diagnostics.LaserOutputPower), - LaserOutputPowerHighAlarmThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerHighAlarmThreshold), - LaserOutputPowerLowAlarmThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerLowAlarmThreshold), - LaserOutputPowerHighWarnThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerHighWarnThreshold), - LaserOutputPowerLowWarnThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerLowWarnThreshold), - - ModuleTemperature: float64(diag.Diagnostics.ModuleTemperature.Value), - ModuleTemperatureHighAlarmThreshold: float64(diag.Diagnostics.ModuleTemperatureHighAlarmThreshold.Value), - ModuleTemperatureLowAlarmThreshold: float64(diag.Diagnostics.ModuleTemperatureLowAlarmThreshold.Value), - ModuleTemperatureHighWarnThreshold: float64(diag.Diagnostics.ModuleTemperatureHighWarnThreshold.Value), - ModuleTemperatureLowWarnThreshold: float64(diag.Diagnostics.ModuleTemperatureLowWarnThreshold.Value), - - LaserOutputPowerDbm: dbmStringToFloat(diag.Diagnostics.LaserOutputPowerDbm), - LaserOutputPowerHighAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerHighAlarmThresholdDbm), - LaserOutputPowerLowAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerLowAlarmThresholdDbm), - LaserOutputPowerHighWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerHighWarnThresholdDbm), - LaserOutputPowerLowWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerLowWarnThresholdDbm), - - ModuleVoltage: float64(diag.Diagnostics.ModuleVoltage), - ModuleVoltageHighAlarmThreshold: float64(diag.Diagnostics.ModuleVoltageHighAlarmThreshold), - ModuleVoltageLowAlarmThreshold: float64(diag.Diagnostics.ModuleVoltageLowAlarmThreshold), - ModuleVoltageHighWarnThreshold: float64(diag.Diagnostics.ModuleVoltageHighWarnThreshold), - ModuleVoltageLowWarnThreshold: float64(diag.Diagnostics.ModuleVoltageLowWarnThreshold), - - RxSignalAvgOpticalPower: float64(diag.Diagnostics.RxSignalAvgOpticalPower), - RxSignalAvgOpticalPowerDbm: dbmStringToFloat(diag.Diagnostics.RxSignalAvgOpticalPowerDbm), - LaserRxOpticalPower: float64(diag.Diagnostics.LaserRxOpticalPower), - LaserRxOpticalPowerHighAlarmThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerHighAlarmThreshold), - LaserRxOpticalPowerLowAlarmThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerLowAlarmThreshold), - LaserRxOpticalPowerHighWarnThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerHighWarnThreshold), - LaserRxOpticalPowerLowWarnThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerLowWarnThreshold), - - LaserRxOpticalPowerDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerDbm), - LaserRxOpticalPowerHighAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerHighAlarmThresholdDbm), - LaserRxOpticalPowerLowAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerLowAlarmThresholdDbm), - LaserRxOpticalPowerHighWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerHighWarnThresholdDbm), - LaserRxOpticalPowerLowWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerLowWarnThresholdDbm), - } - - if len(diag.Diagnostics.Lanes) > 0 { - for _, lane := range diag.Diagnostics.Lanes { - l := &interfaceDiagnostics{ - Index: lane.LaneIndex, - Name: diag.Name, - LaserBiasCurrent: float64(lane.LaserBiasCurrent), - LaserOutputPower: float64(lane.LaserOutputPower), - LaserOutputPowerDbm: dbmStringToFloat(lane.LaserOutputPowerDbm), - LaserRxOpticalPower: float64(lane.LaserRxOpticalPower), - LaserRxOpticalPowerDbm: dbmStringToFloat(lane.LaserRxOpticalPowerDbm), - } - - d.Lanes = append(d.Lanes, l) - } - - /* For some interfaces with 0 lanes there sometimes is instead of - in the xml/json response and vice-versa.*/ - } else if diag.Diagnostics.LaserRxOpticalPowerDbm == "" { - d.LaserRxOpticalPower = d.RxSignalAvgOpticalPower - d.LaserRxOpticalPowerDbm = d.RxSignalAvgOpticalPowerDbm - - } else if diag.Diagnostics.RxSignalAvgOpticalPowerDbm == "" { - d.RxSignalAvgOpticalPower = d.LaserRxOpticalPower - d.RxSignalAvgOpticalPowerDbm = d.LaserRxOpticalPowerDbm - } - - diagnostics = append(diagnostics, d) - } - - return diagnostics -} - -func dbmStringToFloat(value string) float64 { - f, err := strconv.ParseFloat(value, 64) - if err == nil { - return f - } - - return math.Inf(-1) -} diff --git a/pkg/features/interfacediagnostics/helper.go b/pkg/features/interfacediagnostics/helper.go new file mode 100644 index 00000000..b43a3f84 --- /dev/null +++ b/pkg/features/interfacediagnostics/helper.go @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: MIT + +package interfacediagnostics + +import ( + "math" + "strconv" +) + +func dbmStringToFloat(value string) float64 { + f, err := strconv.ParseFloat(value, 64) + if err == nil { + return f + } + + return math.Inf(-1) +} + +func interfaceDiagnosticsFromRPCResult(res result) []*interfaceDiagnostics { + diagnostics := make([]*interfaceDiagnostics, 0) + + for _, diag := range res.Information.Diagnostics { + if diag.Diagnostics.NA == "N/A" { + continue + } + + d := &interfaceDiagnostics{ + Index: "", + Name: diag.Name, + LaserBiasCurrent: float64(diag.Diagnostics.LaserBiasCurrent), + LaserBiasCurrentHighAlarmThreshold: float64(diag.Diagnostics.LaserBiasCurrentHighAlarmThreshold), + LaserBiasCurrentLowAlarmThreshold: float64(diag.Diagnostics.LaserBiasCurrentLowAlarmThreshold), + LaserBiasCurrentHighWarnThreshold: float64(diag.Diagnostics.LaserBiasCurrentHighWarnThreshold), + LaserBiasCurrentLowWarnThreshold: float64(diag.Diagnostics.LaserBiasCurrentLowWarnThreshold), + + LaserOutputPower: float64(diag.Diagnostics.LaserOutputPower), + LaserOutputPowerHighAlarmThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerHighAlarmThreshold), + LaserOutputPowerLowAlarmThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerLowAlarmThreshold), + LaserOutputPowerHighWarnThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerHighWarnThreshold), + LaserOutputPowerLowWarnThreshold: float64(diag.Diagnostics.LaserTxOpticalPowerLowWarnThreshold), + + ModuleTemperature: float64(diag.Diagnostics.ModuleTemperature.Value), + ModuleTemperatureHighAlarmThreshold: float64(diag.Diagnostics.ModuleTemperatureHighAlarmThreshold.Value), + ModuleTemperatureLowAlarmThreshold: float64(diag.Diagnostics.ModuleTemperatureLowAlarmThreshold.Value), + ModuleTemperatureHighWarnThreshold: float64(diag.Diagnostics.ModuleTemperatureHighWarnThreshold.Value), + ModuleTemperatureLowWarnThreshold: float64(diag.Diagnostics.ModuleTemperatureLowWarnThreshold.Value), + + LaserOutputPowerDbm: dbmStringToFloat(diag.Diagnostics.LaserOutputPowerDbm), + LaserOutputPowerHighAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerHighAlarmThresholdDbm), + LaserOutputPowerLowAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerLowAlarmThresholdDbm), + LaserOutputPowerHighWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerHighWarnThresholdDbm), + LaserOutputPowerLowWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserTxOpticalPowerLowWarnThresholdDbm), + + ModuleVoltage: float64(diag.Diagnostics.ModuleVoltage), + ModuleVoltageHighAlarmThreshold: float64(diag.Diagnostics.ModuleVoltageHighAlarmThreshold), + ModuleVoltageLowAlarmThreshold: float64(diag.Diagnostics.ModuleVoltageLowAlarmThreshold), + ModuleVoltageHighWarnThreshold: float64(diag.Diagnostics.ModuleVoltageHighWarnThreshold), + ModuleVoltageLowWarnThreshold: float64(diag.Diagnostics.ModuleVoltageLowWarnThreshold), + + RxSignalAvgOpticalPower: float64(diag.Diagnostics.RxSignalAvgOpticalPower), + RxSignalAvgOpticalPowerDbm: dbmStringToFloat(diag.Diagnostics.RxSignalAvgOpticalPowerDbm), + LaserRxOpticalPower: float64(diag.Diagnostics.LaserRxOpticalPower), + LaserRxOpticalPowerHighAlarmThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerHighAlarmThreshold), + LaserRxOpticalPowerLowAlarmThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerLowAlarmThreshold), + LaserRxOpticalPowerHighWarnThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerHighWarnThreshold), + LaserRxOpticalPowerLowWarnThreshold: float64(diag.Diagnostics.LaserRxOpticalPowerLowWarnThreshold), + + LaserRxOpticalPowerDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerDbm), + LaserRxOpticalPowerHighAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerHighAlarmThresholdDbm), + LaserRxOpticalPowerLowAlarmThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerLowAlarmThresholdDbm), + LaserRxOpticalPowerHighWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerHighWarnThresholdDbm), + LaserRxOpticalPowerLowWarnThresholdDbm: dbmStringToFloat(diag.Diagnostics.LaserRxOpticalPowerLowWarnThresholdDbm), + } + + if len(diag.Diagnostics.Lanes) > 0 { + for _, lane := range diag.Diagnostics.Lanes { + l := &interfaceDiagnostics{ + Index: lane.LaneIndex, + Name: diag.Name, + LaserBiasCurrent: float64(lane.LaserBiasCurrent), + LaserOutputPower: float64(lane.LaserOutputPower), + LaserOutputPowerDbm: dbmStringToFloat(lane.LaserOutputPowerDbm), + LaserRxOpticalPower: float64(lane.LaserRxOpticalPower), + LaserRxOpticalPowerDbm: dbmStringToFloat(lane.LaserRxOpticalPowerDbm), + } + + d.Lanes = append(d.Lanes, l) + } + + /* For some interfaces with 0 lanes there sometimes is instead of + in the xml/json response and vice-versa.*/ + } else if diag.Diagnostics.LaserRxOpticalPowerDbm == "" { + d.LaserRxOpticalPower = d.RxSignalAvgOpticalPower + d.LaserRxOpticalPowerDbm = d.RxSignalAvgOpticalPowerDbm + + } else if diag.Diagnostics.RxSignalAvgOpticalPowerDbm == "" { + d.RxSignalAvgOpticalPower = d.LaserRxOpticalPower + d.RxSignalAvgOpticalPowerDbm = d.LaserRxOpticalPowerDbm + } + + diagnostics = append(diagnostics, d) + } + + return diagnostics +} From 2864d45647cf96f3ca32e56921b459b5ab359b2e Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Wed, 20 Sep 2023 14:44:09 +0200 Subject: [PATCH 06/49] move interfaceMediaInfoFromRPCResult to helpers --- pkg/features/interfacediagnostics/collector.go | 14 -------------- pkg/features/interfacediagnostics/helper.go | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkg/features/interfacediagnostics/collector.go b/pkg/features/interfacediagnostics/collector.go index ae59fcaa..a1f32cd9 100644 --- a/pkg/features/interfacediagnostics/collector.go +++ b/pkg/features/interfacediagnostics/collector.go @@ -279,20 +279,6 @@ func (c *interfaceDiagnosticsCollector) interfaceMediaInfo(client collector.Clie return interfaceMediaInfoFromRPCResult(&x.InterfaceInformation.PhysicalInterface), nil } -func interfaceMediaInfoFromRPCResult(interfaceMediaList *[]physicalInterface) map[string]*physicalInterface { - interfaceMediaDict := make(map[string]*physicalInterface) - - for _, i := range *interfaceMediaList { - if strings.HasPrefix(i.Name, "xe") || strings.HasPrefix(i.Name, "ge") || strings.HasPrefix(i.Name, "et") { - iface := i - slotIndex := iface.Name[3:] - interfaceMediaDict[slotIndex] = &iface - } - } - - return interfaceMediaDict -} - func (c *interfaceDiagnosticsCollector) chassisHardwareInfos(client collector.Client) ([]*transceiverInformation, error) { var x = chassisHardware{} err := client.RunCommandAndParse("show chassis hardware", &x) diff --git a/pkg/features/interfacediagnostics/helper.go b/pkg/features/interfacediagnostics/helper.go index b43a3f84..01ced0b1 100644 --- a/pkg/features/interfacediagnostics/helper.go +++ b/pkg/features/interfacediagnostics/helper.go @@ -5,6 +5,7 @@ package interfacediagnostics import ( "math" "strconv" + "strings" ) func dbmStringToFloat(value string) float64 { @@ -103,3 +104,17 @@ func interfaceDiagnosticsFromRPCResult(res result) []*interfaceDiagnostics { return diagnostics } + +func interfaceMediaInfoFromRPCResult(interfaceMediaList *[]physicalInterface) map[string]*physicalInterface { + interfaceMediaDict := make(map[string]*physicalInterface) + + for _, i := range *interfaceMediaList { + if strings.HasPrefix(i.Name, "xe") || strings.HasPrefix(i.Name, "ge") || strings.HasPrefix(i.Name, "et") { + iface := i + slotIndex := iface.Name[3:] + interfaceMediaDict[slotIndex] = &iface + } + } + + return interfaceMediaDict +} From 1e3123a6fc7cc8c1dba0bcdb4a2e7fbee6adc173 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Wed, 20 Sep 2023 14:56:36 +0200 Subject: [PATCH 07/49] add new label representing BGP options to BGP info metric --- junos_collector.go | 4 ++-- main.go | 6 +++--- pkg/features/bgp/collector.go | 5 +++-- pkg/features/bgp/rpc.go | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/junos_collector.go b/junos_collector.go index c2aa4c93..fd6b0f63 100644 --- a/junos_collector.go +++ b/junos_collector.go @@ -41,7 +41,7 @@ type junosCollector struct { ctx context.Context } -func newJunosCollector(ctx context.Context, devices []*connector.Device, connectionManager *connector.SSHConnectionManager, logicalSystem string) *junosCollector { +func newJunosCollector(ctx context.Context, devices []*connector.Device, logicalSystem string) *junosCollector { l := interfacelabels.NewDynamicLabels() clients := make(map[*connector.Device]*rpc.Client) @@ -117,7 +117,7 @@ func clientForDevice(device *connector.Device, connManager *connector.SSHConnect } if cfg.Features.License { - opts = append(opts, rpc.WithLicenseInformation()) + opts = append(opts, rpc.WithLicenseInformation()) } c := rpc.NewClient(conn, opts...) diff --git a/main.go b/main.go index 773ee5bd..a33bfcd9 100644 --- a/main.go +++ b/main.go @@ -24,7 +24,7 @@ import ( log "github.com/sirupsen/logrus" ) -const version string = "0.12.1" +const version string = "0.12.2" var ( showVersion = flag.Bool("version", false, "Print version information.") @@ -261,7 +261,7 @@ func connectionManager() *connector.SSHConnectionManager { func startServer() { log.Infof("Starting JunOS exporter (Version: %s)", version) - http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + http.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) { w.Write([]byte(` JunOS Exporter (Version ` + version + `) @@ -323,7 +323,7 @@ func handleMetricsRequest(w http.ResponseWriter, r *http.Request) { return } - c := newJunosCollector(ctx, devs, connManager, logicalSystem) + c := newJunosCollector(ctx, devs, logicalSystem) reg.MustRegister(c) l := log.New() diff --git a/pkg/features/bgp/collector.go b/pkg/features/bgp/collector.go index df3b58cc..8e5c1999 100644 --- a/pkg/features/bgp/collector.go +++ b/pkg/features/bgp/collector.go @@ -44,7 +44,7 @@ func init() { preferenceDesc = prometheus.NewDesc(prefix+"preference", "Preference configured for the session", l, nil) holdTimeDesc = prometheus.NewDesc(prefix+"hold_time_seconds", "Hold time configured for the session", l, nil) - infoLabels := append(l, "local_as", "import_policy", "export_policy") + infoLabels := append(l, "local_as", "import_policy", "export_policy", "options") infoDesc = prometheus.NewDesc(prefix+"info", "Information about the session (e.g. configuration)", infoLabels, nil) l = append(l, "table") @@ -174,7 +174,8 @@ func (c *bgpCollector) collectForPeer(p peer, groups groupMap, ch chan<- prometh infoValues := append(l, localASNForPeer(p), formatPolicy(p.OptionInformation.ImportPolicy), - formatPolicy(p.OptionInformation.ExportPolicy)) + formatPolicy(p.OptionInformation.ExportPolicy), + p.OptionInformation.Options) ch <- prometheus.MustNewConstMetric(infoDesc, prometheus.GaugeValue, 1, infoValues...) c.collectRIBForPeer(p, ch, l) diff --git a/pkg/features/bgp/rpc.go b/pkg/features/bgp/rpc.go index b3d8d3ac..fa1bdb79 100644 --- a/pkg/features/bgp/rpc.go +++ b/pkg/features/bgp/rpc.go @@ -43,6 +43,7 @@ type optionInformation struct { PrefixLimit prefixLimit `xml:"prefix-limit"` LocalAs int64 `xml:"local-as"` LocalSystemAs int64 `xml:"local-system-as"` + Options string `xml:"bgp-options"` } type prefixLimit struct { From 5b46a306ba15ac615bd8b68d786e5cbbc939d4a3 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Tue, 26 Sep 2023 10:31:43 +0200 Subject: [PATCH 08/49] code cleanup --- main.go | 2 +- pkg/features/subscriber/collector.go | 10 +++++----- pkg/features/subscriber/rpc.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 833991cb..4e36a5b0 100644 --- a/main.go +++ b/main.go @@ -81,12 +81,12 @@ var ( tracingEnabled = flag.Bool("tracing.enabled", false, "Enables tracing using OpenTelemetry") tracingProvider = flag.String("tracing.provider", "", "Sets the tracing provider (stdout or collector)") tracingCollectorEndpoint = flag.String("tracing.collector.grpc-endpoint", "", "Sets the tracing provider (stdout or collector)") + subscriberEnabled = flag.Bool("subscriber.enabled", false, "Scrape subscribers detail") cfg *config.Config devices []*connector.Device connManager *connector.SSHConnectionManager reloadCh chan chan error configMu sync.RWMutex - subscriberEnabled = flag.Bool("subscriber.enabled", false, "Scrape subscribers detail") ) func init() { diff --git a/pkg/features/subscriber/collector.go b/pkg/features/subscriber/collector.go index c8c104b2..0c354f08 100644 --- a/pkg/features/subscriber/collector.go +++ b/pkg/features/subscriber/collector.go @@ -9,11 +9,11 @@ import ( const prefix string = "junos_subscriber_info" -var subscriberInfo *prometheus.Desc +var subscriberInfoDesc *prometheus.Desc func init() { l := []string{"target", "interface", "agent_circuit_id", "agent_remote_id"} - subscriberInfo = prometheus.NewDesc(prefix+"", "Subscriber Detail", l, nil) + subscriberInfoDesc = prometheus.NewDesc(prefix+"", "Subscriber Detail", l, nil) } // Name implements collector.RPCCollector. @@ -28,7 +28,7 @@ func NewCollector() collector.RPCCollector { // Describe describes the metrics func (*subcsribers_information) Describe(ch chan<- *prometheus.Desc) { - ch <- subscriberInfo + ch <- subscriberInfoDesc } // Collect collects metrics from JunOS @@ -40,8 +40,8 @@ func (c *subcsribers_information) Collect(client collector.Client, ch chan<- pro } for _, subscriber := range x.SubscribersInformation.Subscriber { - labels := append(labelValues, subscriber.Interface, subscriber.AgentCircuitId, subscriber.AgentRemoteId) - ch <- prometheus.MustNewConstMetric(subscriberInfo, prometheus.CounterValue, 1, labels...) + labels := append(labelValues, subscriber.Interface, subscriber.AgentCircuitID, subscriber.AgentRemoteID) + ch <- prometheus.MustNewConstMetric(subscriberInfoDesc, prometheus.CounterValue, 1, labels...) } return nil diff --git a/pkg/features/subscriber/rpc.go b/pkg/features/subscriber/rpc.go index 8fb028b1..4194d092 100644 --- a/pkg/features/subscriber/rpc.go +++ b/pkg/features/subscriber/rpc.go @@ -9,6 +9,6 @@ type subcsribers_information struct { type subscriber struct { AccessType string `xml:"access-type"` Interface string `xml:"interface"` - AgentCircuitId string `xml:"agent-circuit-id"` - AgentRemoteId string `xml:"agent-remote-id"` + AgentCircuitID string `xml:"agent-circuit-id"` + AgentRemoteID string `xml:"agent-remote-id"` } From b113665844f9296a29d7c1c3dc8f2fe39e4db29c Mon Sep 17 00:00:00 2001 From: Antoine Huret Date: Sun, 8 Oct 2023 20:30:13 +0200 Subject: [PATCH 09/49] add a new config parameter to decrypt key file with a passphrase + implemented a new feature to get ike connected active users --- collectors.go | 2 + devices.go | 8 +-- internal/config/config.go | 2 + main.go | 1 + pkg/connector/device.go | 4 +- pkg/connector/helper.go | 10 ++- pkg/features/securityike/collector.go | 90 +++++++++++++++++++++++++++ pkg/features/securityike/rpc.go | 36 +++++++++++ 8 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 pkg/features/securityike/collector.go create mode 100644 pkg/features/securityike/rpc.go diff --git a/collectors.go b/collectors.go index 8ef5c2b5..16bd9a8e 100644 --- a/collectors.go +++ b/collectors.go @@ -32,6 +32,7 @@ import ( "github.com/czerwonk/junos_exporter/pkg/features/rpki" "github.com/czerwonk/junos_exporter/pkg/features/rpm" "github.com/czerwonk/junos_exporter/pkg/features/security" + "github.com/czerwonk/junos_exporter/pkg/features/securityike" "github.com/czerwonk/junos_exporter/pkg/features/securitypolicies" "github.com/czerwonk/junos_exporter/pkg/features/storage" "github.com/czerwonk/junos_exporter/pkg/features/subscriber" @@ -105,6 +106,7 @@ func (c *collectors) initCollectorsForDevices(device *connector.Device) { c.addCollectorIfEnabledForDevice(device, "rpki", f.RPKI, rpki.NewCollector) c.addCollectorIfEnabledForDevice(device, "rpm", f.RPM, rpm.NewCollector) c.addCollectorIfEnabledForDevice(device, "security", f.Security, security.NewCollector) + c.addCollectorIfEnabledForDevice(device, "security_ike", f.SecurityIKE, securityike.NewCollector) c.addCollectorIfEnabledForDevice(device, "security_policies", f.SecurityPolicies, securitypolicies.NewCollector) c.addCollectorIfEnabledForDevice(device, "storage", f.Storage, storage.NewCollector) c.addCollectorIfEnabledForDevice(device, "system", (f.System || f.License), system.NewCollector) diff --git a/devices.go b/devices.go index 592ebcdd..ca6c55c1 100644 --- a/devices.go +++ b/devices.go @@ -75,11 +75,11 @@ func authForDevice(device *config.DeviceConfig, cfg *config.Config) (connector.A } if device.KeyFile != "" { - return authForKeyFile(user, device.KeyFile) + return authForKeyFile(user, device.KeyFile, device.KeyPassphrase) } if *sshKeyFile != "" { - return authForKeyFile(user, *sshKeyFile) + return authForKeyFile(user, *sshKeyFile, *sshKeyPassphrase) } if device.Password != "" { @@ -97,14 +97,14 @@ func authForDevice(device *config.DeviceConfig, cfg *config.Config) (connector.A return nil, errors.New("no valid authentication method available") } -func authForKeyFile(username, keyFile string) (connector.AuthMethod, error) { +func authForKeyFile(username, keyFile, keyPassphrase string) (connector.AuthMethod, error) { f, err := os.Open(keyFile) if err != nil { return nil, errors.Wrap(err, "could not open ssh key file") } defer f.Close() - auth, err := connector.AuthByKey(username, f) + auth, err := connector.AuthByKey(username, f, keyPassphrase) if err != nil { return nil, errors.Wrap(err, "could not load ssh private key file") } diff --git a/internal/config/config.go b/internal/config/config.go index c7bf82f4..d7b30f59 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -25,6 +25,7 @@ type DeviceConfig struct { Username string `yaml:"username,omitempty"` Password string `yaml:"password,omitempty"` KeyFile string `yaml:"key_file,omitempty"` + KeyPassphrase string `yaml:"key_passphrase,omitempty"` Features *FeatureConfig `yaml:"features,omitempty"` IfDescReg string `yaml:"interface_description_regex,omitempty"` IsHostPattern bool `yaml:"host_pattern,omitempty"` @@ -54,6 +55,7 @@ type FeatureConfig struct { Accounting bool `yaml:"accounting,omitempty"` IPSec bool `yaml:"ipsec,omitempty"` Security bool `yaml:"security,omitempty"` + SecurityIKE bool `yaml:"security_ike,omitempty"` SecurityPolicies bool `yaml:"security_policies,omitempty"` FPC bool `yaml:"fpc,omitempty"` RPKI bool `yaml:"rpki,omitempty"` diff --git a/main.go b/main.go index 4e36a5b0..43c8364c 100644 --- a/main.go +++ b/main.go @@ -33,6 +33,7 @@ var ( sshHosts = flag.String("ssh.targets", "", "Hosts to scrape") sshUsername = flag.String("ssh.user", "junos_exporter", "Username to use when connecting to junos devices using ssh") sshKeyFile = flag.String("ssh.keyfile", "", "Public key file to use when connecting to junos devices using ssh") + sshKeyPassphrase = flag.String("ssh.keyPassphrase", "", "Passphrase to decrypt key file if it's encrypted") sshPassword = flag.String("ssh.password", "", "Password to use when connecting to junos devices using ssh") sshReconnectInterval = flag.Duration("ssh.reconnect-interval", 30*time.Second, "Duration to wait before reconnecting to a device after connection got lost") sshKeepAliveInterval = flag.Duration("ssh.keep-alive-interval", 10*time.Second, "Duration to wait between keep alive messages") diff --git a/pkg/connector/device.go b/pkg/connector/device.go index b671b324..aa28416d 100644 --- a/pkg/connector/device.go +++ b/pkg/connector/device.go @@ -26,8 +26,8 @@ func AuthByPassword(username, password string) AuthMethod { } // AuthByKey uses public key authentication -func AuthByKey(username string, key io.Reader) (AuthMethod, error) { - pk, err := loadPrivateKey(key) +func AuthByKey(username string, key io.Reader, keyPassphrase string) (AuthMethod, error) { + pk, err := loadPrivateKey(key, keyPassphrase) if err != nil { return nil, err } diff --git a/pkg/connector/helper.go b/pkg/connector/helper.go index 9786d637..41014b89 100644 --- a/pkg/connector/helper.go +++ b/pkg/connector/helper.go @@ -9,13 +9,19 @@ import ( "golang.org/x/crypto/ssh" ) -func loadPrivateKey(r io.Reader) (ssh.AuthMethod, error) { +func loadPrivateKey(r io.Reader, keyPassphrase string) (ssh.AuthMethod, error) { b, err := io.ReadAll(r) if err != nil { return nil, errors.Wrap(err, "could not read from reader") } - key, err := ssh.ParsePrivateKey(b) + var key ssh.Signer + if keyPassphrase == "" { + key, err = ssh.ParsePrivateKey(b) + } else { + key, err = ssh.ParsePrivateKeyWithPassphrase(b, []byte(keyPassphrase)) + } + if err != nil { return nil, errors.Wrap(err, "could not parse private key") } diff --git a/pkg/features/securityike/collector.go b/pkg/features/securityike/collector.go new file mode 100644 index 00000000..5beba342 --- /dev/null +++ b/pkg/features/securityike/collector.go @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: MIT + +package securityike + +import ( + "encoding/xml" + "strconv" + "strings" + + "github.com/czerwonk/junos_exporter/pkg/collector" + "github.com/prometheus/client_golang/prometheus" +) + +const prefix string = "junos_security_ike_" + +var ( + connectedActiveUsers *prometheus.Desc +) + +func init() { + l := []string{"target", "re_name"} + + connectedActiveUsers = prometheus.NewDesc(prefix+"connected_active_users", "Number of connected active users", append(l, "remote_address", "remote_port", "ike_id", "x_auth_username", "x_auth_user_assigned_ip"), nil) +} + +type securityIKECollector struct { +} + +// NewCollector creates a new collector +func NewCollector() collector.RPCCollector { + return &securityIKECollector{} +} + +// Name returns the name of the collector +func (*securityIKECollector) Name() string { + return "Security IKE" +} + +// Describe describes the metrics +func (*securityIKECollector) Describe(ch chan<- *prometheus.Desc) { + ch <- connectedActiveUsers +} + +// Collect collects metrics from JunOS +func (c *securityIKECollector) Collect(client collector.Client, ch chan<- prometheus.Metric, labelValues []string) error { + var x = multiEngineResult{} + err := client.RunCommandAndParseWithParser("show security ike active-peer", func(b []byte) error { + return parseXML(b, &x) + }) + if err != nil { + return err + } + + for _, re := range x.Results.RoutingEngines { + ls := append(labelValues, re.Name) + activePeersCounters := make(map[string]int) + for _, ap := range re.IKEActivePeersInformation.IKEActivePeers { + saRemotePort := strconv.Itoa(ap.IKESARemotePort) + key := ap.IKESARemoteAddress + saRemotePort + ap.IKEIKEID + ap.IKEXAuthUsername + ap.IKEXAuthUserAssignedIP + if _, exists := activePeersCounters[key]; !exists { + activePeersCounters[key] = 0 + } + activePeersCounters[key] += 1 + ch <- prometheus.MustNewConstMetric(connectedActiveUsers, prometheus.GaugeValue, float64(activePeersCounters[key]), append(ls, ap.IKESARemoteAddress, saRemotePort, ap.IKEIKEID, ap.IKEXAuthUsername, ap.IKEXAuthUserAssignedIP)...) + } + } + + return err +} + +func parseXML(b []byte, res *multiEngineResult) error { + if strings.Contains(string(b), "multi-routing-engine-results") { + return xml.Unmarshal(b, res) + } + + fi := singleEngineResult{} + + err := xml.Unmarshal(b, &fi) + if err != nil { + return err + } + + res.Results.RoutingEngines = []routingEngine{ + { + Name: "N/A", + IKEActivePeersInformation: fi.IKEActivePeersInformation, + }, + } + return nil +} diff --git a/pkg/features/securityike/rpc.go b/pkg/features/securityike/rpc.go new file mode 100644 index 00000000..7631bf7d --- /dev/null +++ b/pkg/features/securityike/rpc.go @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: MIT + +package securityike + +import "encoding/xml" + +type multiEngineResult struct { + XMLName xml.Name `xml:"rpc-reply"` + Results routingEngines `xml:"multi-routing-engine-results"` +} + +type routingEngines struct { + RoutingEngines []routingEngine `xml:"multi-routing-engine-item"` +} + +type routingEngine struct { + Name string `xml:"re-name"` + IKEActivePeersInformation ikeActivePeersInformation `xml:"ike-active-peers-information"` +} + +type ikeActivePeersInformation struct { + IKEActivePeers []ikeActivePeer `xml:"ike-active-peers"` +} + +type ikeActivePeer struct { + IKESARemoteAddress string `xml:"ike-sa-remote-address"` + IKESARemotePort int `xml:"ike-sa-remote-port"` + IKEIKEID string `xml:"ike-ike-id"` + IKEXAuthUsername string `xml:"ike-xauth-username"` + IKEXAuthUserAssignedIP string `xml:"ike-xauth-user-assigned-ip"` +} + +type singleEngineResult struct { + XMLName xml.Name `xml:"rpc-reply"` + IKEActivePeersInformation ikeActivePeersInformation `xml:"ike-active-peers-information"` +} From 1053b172ad493fac3ac37131985a53dc3e38b16e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:23:18 +0000 Subject: [PATCH 10/49] Bump golang.org/x/net from 0.7.0 to 0.17.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index f202357b..61e6ed91 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 go.opentelemetry.io/otel/sdk v1.12.0 go.opentelemetry.io/otel/trace v1.12.0 - golang.org/x/crypto v0.3.0 + golang.org/x/crypto v0.14.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -20,8 +20,8 @@ require ( github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect google.golang.org/grpc v1.53.0 // indirect ) @@ -40,7 +40,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0 go.opentelemetry.io/proto/otlp v0.19.0 // indirect - golang.org/x/sys v0.5.0 // indirect + golang.org/x/sys v0.13.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index abdfa5f1..45ae3521 100644 --- a/go.sum +++ b/go.sum @@ -268,8 +268,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -332,8 +332,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -392,11 +392,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -405,8 +405,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From adca4782e7ef18aed367505a641ba53af447aebb Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Wed, 18 Oct 2023 10:11:35 +0200 Subject: [PATCH 11/49] add test for #226 --- junos_collector.go | 4 +--- pkg/interfacelabels/dynamic_labels.go | 4 ++++ pkg/interfacelabels/dynamic_labels_test.go | 17 +++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/junos_collector.go b/junos_collector.go index fd6b0f63..907f936d 100644 --- a/junos_collector.go +++ b/junos_collector.go @@ -24,14 +24,12 @@ var ( scrapeCollectorDurationDesc *prometheus.Desc scrapeDurationDesc *prometheus.Desc upDesc *prometheus.Desc - defaultIfDescReg *regexp.Regexp ) func init() { upDesc = prometheus.NewDesc(prefix+"up", "Scrape of target was successful", []string{"target"}, nil) scrapeDurationDesc = prometheus.NewDesc(prefix+"collector_duration_seconds", "Duration of a collector scrape for one target", []string{"target"}, nil) scrapeCollectorDurationDesc = prometheus.NewDesc(prefix+"collect_duration_seconds", "Duration of a scrape by collector and target", []string{"target", "collector"}, nil) - defaultIfDescReg = regexp.MustCompile(`\[([^=\]]+)(=[^\]]+)?\]`) } type junosCollector struct { @@ -98,7 +96,7 @@ func deviceInterfaceRegex(host string) *regexp.Regexp { log.Errorf("global dynamic label regex (%s) invalid: %v", cfg.IfDescReg, err) } - return defaultIfDescReg + return interfacelabels.DefaultInterfaceDescRegex() } func clientForDevice(device *connector.Device, connManager *connector.SSHConnectionManager) (*rpc.Client, error) { diff --git a/pkg/interfacelabels/dynamic_labels.go b/pkg/interfacelabels/dynamic_labels.go index 92bc6bae..f25691ca 100644 --- a/pkg/interfacelabels/dynamic_labels.go +++ b/pkg/interfacelabels/dynamic_labels.go @@ -20,6 +20,10 @@ func init() { nameRe = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9_]*$`) } +func DefaultInterfaceDescRegex() *regexp.Regexp { + return regexp.MustCompile(`\[([^=\]]+)(=[^\]]+)?\]`) +} + // NewDynamicLabels create a new instance of DynamicLabels func NewDynamicLabels() *DynamicLabels { return &DynamicLabels{ diff --git a/pkg/interfacelabels/dynamic_labels_test.go b/pkg/interfacelabels/dynamic_labels_test.go index d539c57f..7543ace1 100644 --- a/pkg/interfacelabels/dynamic_labels_test.go +++ b/pkg/interfacelabels/dynamic_labels_test.go @@ -13,7 +13,7 @@ import ( func TestParseDescriptions(t *testing.T) { t.Run("Test default", func(t *testing.T) { l := NewDynamicLabels() - regex := regexp.MustCompile(`\[([^=\]]+)(=[^\]]+)?\]`) + regex := DefaultInterfaceDescRegex() if1 := phyInterface{ Name: "xe-0/0/0", @@ -26,17 +26,22 @@ func TestParseDescriptions(t *testing.T) { if3 := phyInterface{ Name: "xe-0/0/3", } + if4 := phyInterface{ + Name: "irb.216", + Description: "Internal: Test-Network [vrf=AS4711]", + } d1 := &connector.Device{Host: "device1"} d2 := &connector.Device{Host: "device2"} l.parseDescriptions(d1, []phyInterface{if1}, regex) - l.parseDescriptions(d2, []phyInterface{if2}, regex) + l.parseDescriptions(d2, []phyInterface{if2, if3, if4}, regex) - assert.Equal(t, []string{"tag1", "foo", "bar"}, l.LabelNames(), "Label names") - assert.Equal(t, []string{"1", "x", ""}, l.ValuesForInterface(d1, if1.Name), "Values if1") - assert.Equal(t, []string{"", "y", "123"}, l.ValuesForInterface(d2, if2.Name), "Values if2") - assert.Equal(t, []string{"", "", ""}, l.ValuesForInterface(d2, if3.Name), "Values if3") + assert.Equal(t, []string{"tag1", "foo", "bar", "vrf"}, l.LabelNames(), "Label names") + assert.Equal(t, []string{"1", "x", "", ""}, l.ValuesForInterface(d1, if1.Name), "Values if1") + assert.Equal(t, []string{"", "y", "123", ""}, l.ValuesForInterface(d2, if2.Name), "Values if2") + assert.Equal(t, []string{"", "", "", ""}, l.ValuesForInterface(d2, if3.Name), "Values if3") + assert.Equal(t, []string{"", "", "", "AS4711"}, l.ValuesForInterface(d2, if4.Name), "Values if4") }) t.Run("Test custom regex", func(t *testing.T) { From aff64df18bf4f660cac479212242302395e88356 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Wed, 18 Oct 2023 10:45:57 +0200 Subject: [PATCH 12/49] add parsing of logical interface descriptions (fixes #226) --- main.go | 2 +- pkg/interfacelabels/dynamic_labels.go | 7 ++++--- pkg/interfacelabels/dynamic_labels_test.go | 24 +++++++++++----------- pkg/interfacelabels/rpc.go | 5 +++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/main.go b/main.go index 43c8364c..06e79ffe 100644 --- a/main.go +++ b/main.go @@ -24,7 +24,7 @@ import ( log "github.com/sirupsen/logrus" ) -const version string = "0.12.2" +const version string = "0.12.3" var ( showVersion = flag.Bool("version", false, "Print version information.") diff --git a/pkg/interfacelabels/dynamic_labels.go b/pkg/interfacelabels/dynamic_labels.go index f25691ca..38fd3b90 100644 --- a/pkg/interfacelabels/dynamic_labels.go +++ b/pkg/interfacelabels/dynamic_labels.go @@ -58,7 +58,8 @@ func (l *DynamicLabels) CollectDescriptions(device *connector.Device, client col return errors.Wrap(err, "could not retrieve interface descriptions for "+device.Host) } - l.parseDescriptions(device, r.Information.Interfaces, ifDescReg) + l.parseDescriptions(device, r.Information.LogicalInterfaces, ifDescReg) + l.parseDescriptions(device, r.Information.PhysicalInterfaces, ifDescReg) return nil } @@ -91,7 +92,7 @@ func (l *DynamicLabels) ValuesForInterface(device *connector.Device, ifaceName s return labels } -func (l *DynamicLabels) parseDescriptions(device *connector.Device, ifaces []phyInterface, ifDescReg *regexp.Regexp) { +func (l *DynamicLabels) parseDescriptions(device *connector.Device, ifaces []interfaceDescription, ifDescReg *regexp.Regexp) { l.mu.Lock() defer l.mu.Unlock() @@ -110,7 +111,7 @@ func (l *DynamicLabels) parseDescriptions(device *connector.Device, ifaces []phy } } -func (l *DynamicLabels) parseDescription(iface phyInterface, ifDescReg *regexp.Regexp) []*interfaceLabel { +func (l *DynamicLabels) parseDescription(iface interfaceDescription, ifDescReg *regexp.Regexp) []*interfaceLabel { labels := make([]*interfaceLabel, 0) if len(iface.Description) == 0 { diff --git a/pkg/interfacelabels/dynamic_labels_test.go b/pkg/interfacelabels/dynamic_labels_test.go index 7543ace1..94a30701 100644 --- a/pkg/interfacelabels/dynamic_labels_test.go +++ b/pkg/interfacelabels/dynamic_labels_test.go @@ -15,18 +15,18 @@ func TestParseDescriptions(t *testing.T) { l := NewDynamicLabels() regex := DefaultInterfaceDescRegex() - if1 := phyInterface{ + if1 := interfaceDescription{ Name: "xe-0/0/0", Description: "Name1 [tag1] [foo=x]", } - if2 := phyInterface{ + if2 := interfaceDescription{ Name: "xe-0/0/1", Description: "Name2 [foo=y] [bar=123]", } - if3 := phyInterface{ + if3 := interfaceDescription{ Name: "xe-0/0/3", } - if4 := phyInterface{ + if4 := interfaceDescription{ Name: "irb.216", Description: "Internal: Test-Network [vrf=AS4711]", } @@ -34,8 +34,8 @@ func TestParseDescriptions(t *testing.T) { d1 := &connector.Device{Host: "device1"} d2 := &connector.Device{Host: "device2"} - l.parseDescriptions(d1, []phyInterface{if1}, regex) - l.parseDescriptions(d2, []phyInterface{if2, if3, if4}, regex) + l.parseDescriptions(d1, []interfaceDescription{if1}, regex) + l.parseDescriptions(d2, []interfaceDescription{if2, if3, if4}, regex) assert.Equal(t, []string{"tag1", "foo", "bar", "vrf"}, l.LabelNames(), "Label names") assert.Equal(t, []string{"1", "x", "", ""}, l.ValuesForInterface(d1, if1.Name), "Values if1") @@ -48,15 +48,15 @@ func TestParseDescriptions(t *testing.T) { l := NewDynamicLabels() regex := regexp.MustCompile(`[[\s]([^=\[\]]+)(=[^,\]]+)?[,\]]`) - if1 := phyInterface{ + if1 := interfaceDescription{ Name: "xe-0/0/0", Description: "Name1 [foo=x, bar=y, thisisatag]", } - if2 := phyInterface{ + if2 := interfaceDescription{ Name: "xe-0/0/1", Description: "Name2 [onlyatag]", } - if3 := phyInterface{ + if3 := interfaceDescription{ Name: "xe-0/0/3", Description: "Name2 [foo=x, bar=y, this=is]", } @@ -65,9 +65,9 @@ func TestParseDescriptions(t *testing.T) { d2 := &connector.Device{Host: "device2"} d3 := &connector.Device{Host: "device3"} - l.parseDescriptions(d1, []phyInterface{if1}, regex) - l.parseDescriptions(d2, []phyInterface{if2}, regex) - l.parseDescriptions(d3, []phyInterface{if3}, regex) + l.parseDescriptions(d1, []interfaceDescription{if1}, regex) + l.parseDescriptions(d2, []interfaceDescription{if2}, regex) + l.parseDescriptions(d3, []interfaceDescription{if3}, regex) assert.Equal(t, []string{"foo", "bar", "thisisatag", "onlyatag", "this"}, l.LabelNames(), "Label names") assert.Equal(t, []string{"x", "y", "1", "", ""}, l.ValuesForInterface(d1, if1.Name), "Values if1") diff --git a/pkg/interfacelabels/rpc.go b/pkg/interfacelabels/rpc.go index be118b90..6e96a09d 100644 --- a/pkg/interfacelabels/rpc.go +++ b/pkg/interfacelabels/rpc.go @@ -4,11 +4,12 @@ package interfacelabels type result struct { Information struct { - Interfaces []phyInterface `xml:"physical-interface"` + PhysicalInterfaces []interfaceDescription `xml:"physical-interface"` + LogicalInterfaces []interfaceDescription `xml:"logical-interface"` } `xml:"interface-information"` } -type phyInterface struct { +type interfaceDescription struct { Name string `xml:"name"` Description string `xml:"description"` } From 83b999657f0c533acf0cf54ec41b96f63a209754 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:27:09 +0000 Subject: [PATCH 13/49] Bump google.golang.org/grpc from 1.53.0 to 1.56.3 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.53.0 to 1.56.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.53.0...v1.56.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 61e6ed91..9f26258e 100644 --- a/go.mod +++ b/go.mod @@ -22,8 +22,8 @@ require ( go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/grpc v1.53.0 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.56.3 // indirect ) require ( @@ -32,7 +32,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/common v0.37.0 // indirect @@ -41,6 +41,6 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0 go.opentelemetry.io/proto/otlp v0.19.0 // indirect golang.org/x/sys v0.13.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 45ae3521..670fc623 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -120,8 +120,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -507,8 +508,8 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -525,8 +526,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -540,8 +541,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 156627b7b99c238ab56323befa1da00bdd211aaa Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 14:07:19 +0300 Subject: [PATCH 14/49] helm: junosexporter: Make sshkey value optional --- helm/junosexporter/templates/deployment.yaml | 4 ++++ helm/junosexporter/templates/secret.yaml | 2 ++ helm/junosexporter/values.yaml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index c24dc678..6b5da250 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -32,15 +32,19 @@ spec: containerPort: 9326 protocol: TCP env: + {{- if .Values.sshkey }} - name: SSH_KEYFILE value: "/ssh/ssh-keyfile" + {{- end }} - name: CONFIG_FILE value: "/config/config.yml" volumeMounts: - mountPath: /config name: {{ .Release.Name }}-configmap + {{- if .Values.sshkey }} - mountPath: /ssh name: {{ .Release.Name }}-sshkey + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/helm/junosexporter/templates/secret.yaml b/helm/junosexporter/templates/secret.yaml index caf8b54f..a2eaf580 100644 --- a/helm/junosexporter/templates/secret.yaml +++ b/helm/junosexporter/templates/secret.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sshkey }} apiVersion: v1 kind: Secret data: @@ -8,3 +9,4 @@ metadata: labels: {{- include "junos_exporter.labels" . | nindent 4 }} type: Opaque +{{- end }} diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index b901edca..473add22 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -19,7 +19,7 @@ fullnameOverride: "" # sshkey is the base64 encoded id_rsa you want to use for authentication # generate sshkey with `cat $HOME/.ssh/id_rsa | base64 -w0 && echo` -sshkey: QWRkIHlvdXIgb3duIGlkX3JzYSBoZXJl +# sshkey: "QWRkIHlvdXIgb3duIGlkX3JzYSBoZXJl" # configyml is the configfile for the exporter configyml: |- From c068936f37d96a2704b0a4c52256e7e58721cb6e Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 14:15:07 +0300 Subject: [PATCH 15/49] helm: junosexporter: Allow to specify extra environment variables --- helm/junosexporter/templates/deployment.yaml | 3 +++ helm/junosexporter/values.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index 6b5da250..5ad8ff72 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -38,6 +38,9 @@ spec: {{- end }} - name: CONFIG_FILE value: "/config/config.yml" + {{- with .Values.extraEnv }} + {{- toYaml . | trim | nindent 10 }} + {{- end }} volumeMounts: - mountPath: /config name: {{ .Release.Name }}-configmap diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index 473add22..888caa5c 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -21,6 +21,9 @@ fullnameOverride: "" # generate sshkey with `cat $HOME/.ssh/id_rsa | base64 -w0 && echo` # sshkey: "QWRkIHlvdXIgb3duIGlkX3JzYSBoZXJl" +# Additional junos_exporter container environment variables. +extraEnv: [] + # configyml is the configfile for the exporter configyml: |- devices: From 3a6a881bc9289a2b1a31269f04ed9ec1feeed93a Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 14:22:20 +0300 Subject: [PATCH 16/49] helm: junosexporter: Allow to specify extra arguments --- helm/junosexporter/templates/deployment.yaml | 6 ++++++ helm/junosexporter/values.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index 5ad8ff72..a57c36ff 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -27,6 +27,12 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.extraArgs }} + args: + {{- with .Values.extraArgs }} + {{- toYaml . | trim | nindent 10 }} + {{- end }} + {{- end }} ports: - name: metrics containerPort: 9326 diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index 888caa5c..5c652938 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -24,6 +24,9 @@ fullnameOverride: "" # Additional junos_exporter container environment variables. extraEnv: [] +# Additional junos_exporter container arguments. +extraArgs: [] + # configyml is the configfile for the exporter configyml: |- devices: From 27557564ebd7cfbf815e82a28b9c595fd1d89782 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 14:27:08 +0300 Subject: [PATCH 17/49] helm: junosexporter: Make configyml value optional --- helm/junosexporter/templates/configmap.yaml | 3 +- helm/junosexporter/templates/deployment.yaml | 6 ++++ helm/junosexporter/values.yaml | 32 ++++++++++---------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/helm/junosexporter/templates/configmap.yaml b/helm/junosexporter/templates/configmap.yaml index 94cc20db..15af5b5b 100644 --- a/helm/junosexporter/templates/configmap.yaml +++ b/helm/junosexporter/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{- if .Values.configyml }} apiVersion: v1 kind: ConfigMap data: @@ -7,4 +8,4 @@ metadata: namespace: {{ .Values.namespace }} labels: {{- include "junos_exporter.labels" . | nindent 4 }} - \ No newline at end of file +{{- end }} diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index a57c36ff..21184dfa 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -42,18 +42,24 @@ spec: - name: SSH_KEYFILE value: "/ssh/ssh-keyfile" {{- end }} + {{- if .Values.configyml }} - name: CONFIG_FILE value: "/config/config.yml" + {{- end }} {{- with .Values.extraEnv }} {{- toYaml . | trim | nindent 10 }} {{- end }} + {{- if or .Values.configyml .Values.sshkey }} volumeMounts: + {{- if .Values.configyml }} - mountPath: /config name: {{ .Release.Name }}-configmap + {{- end }} {{- if .Values.sshkey }} - mountPath: /ssh name: {{ .Release.Name }}-sshkey {{- end }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index 5c652938..ae541100 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -28,22 +28,22 @@ extraEnv: [] extraArgs: [] # configyml is the configfile for the exporter -configyml: |- - devices: - - host: srx.example.com - username: junos_exporter - keyfile: /config/ssh-keyfile - - features: - bgp: false - ospf: false - isis: false - l2circuit: false - environment: true - routes: true - routing_engine: true - interface_diagnostic: true - power: true +# configyml: |- +# devices: +# - host: srx.example.com +# username: junos_exporter +# keyfile: /config/ssh-keyfile +# +# features: +# bgp: false +# ospf: false +# isis: false +# l2circuit: false +# environment: true +# routes: true +# routing_engine: true +# interface_diagnostic: true +# power: true #serviceMonitor.scapeTimeout needs to be high since junos_exporter uses ssh #serviceMonitor.interval needs to be higher than scrapeTimeout From d72437062982f7d89799b039133d906e5569f57e Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 14:30:41 +0300 Subject: [PATCH 18/49] helm: junosexporter: Update appVersion to v0.12.2 --- helm/junosexporter/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/junosexporter/Chart.yaml b/helm/junosexporter/Chart.yaml index a858f031..12c29d45 100644 --- a/helm/junosexporter/Chart.yaml +++ b/helm/junosexporter/Chart.yaml @@ -18,7 +18,7 @@ version: 0.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: v0.9.5.7 +appVersion: v0.12.2 # dependencies: # - name: prometheus-operator From 2a1db39cb650e1712c6bbab94f40699fe447b932 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 15:03:14 +0300 Subject: [PATCH 19/49] helm: junosexporter: Allow to disable serviceMonitor --- helm/junosexporter/templates/servicemonitor.yaml | 2 ++ helm/junosexporter/values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/helm/junosexporter/templates/servicemonitor.yaml b/helm/junosexporter/templates/servicemonitor.yaml index 3be0c084..b7072314 100644 --- a/helm/junosexporter/templates/servicemonitor.yaml +++ b/helm/junosexporter/templates/servicemonitor.yaml @@ -1,3 +1,4 @@ +{{- if and .Values.prometheusOperator .Values.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -14,3 +15,4 @@ spec: jobLabel: {{ default "jobLabel" .Values.serviceMonitor.jobLabel }} selector: {{- include "junos_exporter.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index ae541100..1159bff6 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -48,6 +48,7 @@ extraArgs: [] #serviceMonitor.scapeTimeout needs to be high since junos_exporter uses ssh #serviceMonitor.interval needs to be higher than scrapeTimeout serviceMonitor: + enabled: true scrapeTimeout: 60s interval: 120s jobLabel: jobLabel From 868b70538865787d8e1d2e8a1d9224879b3a50cd Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 15:16:15 +0300 Subject: [PATCH 20/49] helm: junosexporter: Change name This commit fixes all generated objects names according to RFC 1123: message: "Helm install failed: 3 errors occurred: * ServiceAccount "prometheus-junos-exporter-junos_exporter" is invalid: metadata.name: Invalid value: "prometheus-junos-exporter-junos_exporter" : a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*') * Service "prometheus-junos-exporter-junos_exporter" is invalid: metadata.name: Invalid value: "prometheus-junos-exporter-junos_exporter": a DNS-1035 label must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name', or 'abc-123', regex used for validation is '[a-z]([-a-z0-9]*[a-z0-9])?') * Deployment.apps "prometheus-junos-exporter-junos_exporter" is invalid: [metadata.name: Invalid value: "prometheus-junos-exporter-junos_exporter": a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'), spec.template.spec.containers[0].name: Invalid value: "junos_exporter": a lowercase RFC 1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?'), spec.template.spec.serviceAccountName: Invalid value: "prometheus-junos-exporter-junos_exporter" : a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*')] --- helm/junosexporter/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/junosexporter/Chart.yaml b/helm/junosexporter/Chart.yaml index 12c29d45..0594211f 100644 --- a/helm/junosexporter/Chart.yaml +++ b/helm/junosexporter/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: junos_exporter +name: junos-exporter description: junos_exporter deployment for prometheus-operator # A chart can be either an 'application' or a 'library' chart. From 60dfe15fdc7a1bdc673bd3e80600cf12a72ebaeb Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 15:28:45 +0300 Subject: [PATCH 21/49] helm: junosexporter: Specify command This commit fixes the error: failed to create containerd task: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: exec: "-ssh.targets=*************\n": executable file not found in $PATH: unknown --- helm/junosexporter/templates/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index 21184dfa..3f70d007 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -27,6 +27,8 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + command: + - /app/junos_exporter {{- if .Values.extraArgs }} args: {{- with .Values.extraArgs }} From 4546e29cde80761175e1e2d25a1e6bd3cb4b5898 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 16:15:34 +0300 Subject: [PATCH 22/49] helm: README.md: Document SSH password authentication --- helm/README.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/helm/README.md b/helm/README.md index 675a6efb..2ba66be1 100644 --- a/helm/README.md +++ b/helm/README.md @@ -1,6 +1,10 @@ # Helm chart for helm v3 ## How to use + +### Authentication + +#### SSH key authentication Add your ssh-keyfile and config.yml to values.yml > sshkey is the base64 encoded id_rsa you want to use for authentication @@ -8,7 +12,47 @@ Add your ssh-keyfile and config.yml to values.yml `sshkey: QWRkIHlvdXIgb3duIGlkX3JzYSBoZXJl` +#### Password authentication +To use password authentication the following values.yaml configuration could +be used with a `junos-exporter-ssh` secret object storing SSH secrets: + +``` yaml +extraArgs: +- "-ssh.targets=$(JUNOS_EXPORTER_SSH_TARGETS)" +- "-ssh.user=$(JUNOS_EXPORTER_SSH_USER)" +- "-ssh.password=$(JUNOS_EXPORTER_SSH_PASSWORD)" + +extraEnv: +- name: JUNOS_EXPORTER_SSH_TARGETS + valueFrom: + secretKeyRef: + name: junos-exporter-ssh + key: targets +- name: JUNOS_EXPORTER_SSH_USER + valueFrom: + secretKeyRef: + name: junos-exporter-ssh + key: username +- name: JUNOS_EXPORTER_SSH_PASSWORD + valueFrom: + secretKeyRef: + name: junos-exporter-ssh + key: password +``` + +``` yaml +apiVersion: v1 +kind: Secret +type: Opaque +data: + password: BASE64_ENCODED_SSH_PASSWORD + targets: BASE64_ENCODED_SSH_TARGETS + username: BASE64_ENCODED_SSH_USERNAME +``` + +### Devices configuration Add your devices to the devices in configyml in values.yml +### Installation > cd helm > helm install junosexporter ./junosexporter From 397f6d06998062b447a569a80318003207f3d7e0 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 16:22:16 +0300 Subject: [PATCH 23/49] helm: junosexporter: Fix missing volumes --- helm/junosexporter/templates/deployment.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index 3f70d007..cdf49187 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -64,6 +64,19 @@ spec: {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} + {{- if or .Values.configyml .Values.sshkey }} + volumes: + {{- if .Values.configyml }} + - name: {{ .Release.Name }}-configmap + configMap: + name: {{ .Release.Name }}-configmap + {{- end }} + {{- if .Values.sshkey }} + - name: {{ .Release.Name }}-sshkey + secret: + secretName: {{ .Release.Name }}-sshkey + {{- end }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} From 86b47f03e4383b4a0cf7aa59114ecf964a32a0a5 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 17:29:52 +0300 Subject: [PATCH 24/49] helm: junosexporter: Rename servicemonitor This commit fixes the lint warning: $ helm lint junosexporter ==> Linting . [INFO] Chart.yaml: icon is recommended [WARNING] templates/servicemonitor.yaml: object name does not conform to Kubernetes naming requirements: "test-release-serviceMonitor": metadata.name: Invalid value: "test-release-serviceMonitor": a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*') --- helm/junosexporter/templates/servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/junosexporter/templates/servicemonitor.yaml b/helm/junosexporter/templates/servicemonitor.yaml index b7072314..82e52d72 100644 --- a/helm/junosexporter/templates/servicemonitor.yaml +++ b/helm/junosexporter/templates/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ .Release.Name }}-serviceMonitor + name: {{ .Release.Name }}-servicemonitor namespace: {{ .Values.namespace }} release: {{ .Values.prometheusOperator }} labels: From 3a42b4b4336630454508ee48cef092c26cc57b70 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 17:47:28 +0300 Subject: [PATCH 25/49] helm: junosexporter: Pass configmap as a map --- helm/junosexporter/templates/configmap.yaml | 3 ++- helm/junosexporter/values.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/helm/junosexporter/templates/configmap.yaml b/helm/junosexporter/templates/configmap.yaml index 15af5b5b..0e398928 100644 --- a/helm/junosexporter/templates/configmap.yaml +++ b/helm/junosexporter/templates/configmap.yaml @@ -2,7 +2,8 @@ apiVersion: v1 kind: ConfigMap data: - config.yml: {{ toYaml .Values.configyml | indent 2 }} + config.yml: | + {{- toYaml .Values.configyml | nindent 4 }} metadata: name: {{ .Release.Name }}-configmap namespace: {{ .Values.namespace }} diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index 1159bff6..8f04b215 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -28,7 +28,7 @@ extraEnv: [] extraArgs: [] # configyml is the configfile for the exporter -# configyml: |- +# configyml: # devices: # - host: srx.example.com # username: junos_exporter From 231b31efc93a3ae9e3331056e8e93974b607c711 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 18:37:46 +0300 Subject: [PATCH 26/49] helm: junosexporter: Delete namespace The namespace is determined at installation time by Helm --namespace flag. --- helm/junosexporter/templates/configmap.yaml | 1 - helm/junosexporter/values.yaml | 2 -- 2 files changed, 3 deletions(-) diff --git a/helm/junosexporter/templates/configmap.yaml b/helm/junosexporter/templates/configmap.yaml index 0e398928..075639f3 100644 --- a/helm/junosexporter/templates/configmap.yaml +++ b/helm/junosexporter/templates/configmap.yaml @@ -6,7 +6,6 @@ data: {{- toYaml .Values.configyml | nindent 4 }} metadata: name: {{ .Release.Name }}-configmap - namespace: {{ .Values.namespace }} labels: {{- include "junos_exporter.labels" . | nindent 4 }} {{- end }} diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index 8f04b215..1e384b53 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -4,8 +4,6 @@ replicaCount: 1 -namespace: monitoring - # prometheusOperator is the relase label for prometheus-operator to look at the servicemonitor prometheusOperator: prometheus-operator From cb746239af0cd1e82a5d8b1c98c2cbd1ac29d514 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 18:59:59 +0300 Subject: [PATCH 27/49] helm: junosexporter: Restart pods automatically on configmap change --- helm/junosexporter/templates/deployment.yaml | 7 +++++++ helm/junosexporter/values.yaml | 3 +++ 2 files changed, 10 insertions(+) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index cdf49187..2b9b4152 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -11,6 +11,13 @@ spec: {{- include "junos_exporter.selectorLabels" . | nindent 6 }} template: metadata: + {{- if .Values.rollOutJunosExporterPods }} + annotations: + {{- if .Values.rollOutJunosExporterPods }} + # ensure pods roll when configmap updates + junos-exporter.github.io/junos-exporter-configmap-checksum: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum | quote }} + {{- end }} + {{- end }} labels: {{- include "junos_exporter.selectorLabels" . | nindent 8 }} spec: diff --git a/helm/junosexporter/values.yaml b/helm/junosexporter/values.yaml index 1e384b53..0ce99989 100644 --- a/helm/junosexporter/values.yaml +++ b/helm/junosexporter/values.yaml @@ -90,3 +90,6 @@ nodeSelector: {} tolerations: [] affinity: {} + +# Roll out junos-exporter pods automatically when configmap is updated. +rollOutJunosExporterPods: false From 40e78428b2285fe793cc6587b7504907a42333d5 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 19:11:08 +0300 Subject: [PATCH 28/49] helm: junosexporter: Fix not loading config file --- helm/junosexporter/templates/deployment.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/helm/junosexporter/templates/deployment.yaml b/helm/junosexporter/templates/deployment.yaml index 2b9b4152..86843308 100644 --- a/helm/junosexporter/templates/deployment.yaml +++ b/helm/junosexporter/templates/deployment.yaml @@ -38,6 +38,9 @@ spec: - /app/junos_exporter {{- if .Values.extraArgs }} args: + {{- if .Values.configyml }} + - -config.file=/config/config.yml + {{- end }} {{- with .Values.extraArgs }} {{- toYaml . | trim | nindent 10 }} {{- end }} @@ -51,10 +54,6 @@ spec: - name: SSH_KEYFILE value: "/ssh/ssh-keyfile" {{- end }} - {{- if .Values.configyml }} - - name: CONFIG_FILE - value: "/config/config.yml" - {{- end }} {{- with .Values.extraEnv }} {{- toYaml . | trim | nindent 10 }} {{- end }} From 60b8c1bf8cf2f8516a7ea80a521e2a66de794a27 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 10 Nov 2023 14:31:14 +0300 Subject: [PATCH 29/49] helm: junosexporter: Update version to 0.2.0 --- helm/junosexporter/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/junosexporter/Chart.yaml b/helm/junosexporter/Chart.yaml index 0594211f..43e8f03a 100644 --- a/helm/junosexporter/Chart.yaml +++ b/helm/junosexporter/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.1.0 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. From 44580ae8b04543e0872760adc50ecf10ac0bfb21 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Mon, 13 Nov 2023 07:57:34 +0100 Subject: [PATCH 30/49] use go version 1.21 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- go.mod | 54 +-- go.sum | 610 ++++------------------------------ 4 files changed, 98 insertions(+), 570 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index affe6fba..6c877b07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.20" + go-version: "1.21" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f5411ec..5c7c7351 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: test: strategy: matrix: - go-version: ["1.20.x"] + go-version: ["1.21.x"] platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/go.mod b/go.mod index 9f26258e..ccea1a32 100644 --- a/go.mod +++ b/go.mod @@ -1,46 +1,48 @@ module github.com/czerwonk/junos_exporter -go 1.20 +go 1.21 require ( github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.14.0 - github.com/prometheus/client_model v0.3.0 - github.com/sirupsen/logrus v1.9.0 - github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/otel v1.12.0 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 - go.opentelemetry.io/otel/sdk v1.12.0 - go.opentelemetry.io/otel/trace v1.12.0 - golang.org/x/crypto v0.14.0 + github.com/prometheus/client_golang v1.17.0 + github.com/prometheus/client_model v0.5.0 + github.com/sirupsen/logrus v1.9.3 + github.com/stretchr/testify v1.8.4 + go.opentelemetry.io/otel v1.20.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.20.0 + go.opentelemetry.io/otel/sdk v1.20.0 + go.opentelemetry.io/otel/trace v1.20.0 + golang.org/x/crypto v0.15.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.3 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect + go.opentelemetry.io/otel/metric v1.20.0 // indirect + golang.org/x/net v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/grpc v1.59.0 // indirect ) require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0 - go.opentelemetry.io/proto/otlp v0.19.0 // indirect - golang.org/x/sys v0.13.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 + go.opentelemetry.io/proto/otlp v1.0.0 // indirect + golang.org/x/sys v0.14.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 670fc623..e2857762 100644 --- a/go.sum +++ b/go.sum @@ -1,572 +1,98 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= -github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 h1:6UKoz5ujsI55KNpsJH3UwCq3T8kKbZwNZBNPuTTje8U= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= -go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 h1:UfDENi+LTcLjQ/JhaXimjlIgn7wWjwbEMmdREm2Gyng= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0/go.mod h1:rqbht/LlhVBgn5+k3M5QK96K5Xb0DvXpMJ5SFQpY6uw= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0 h1:ZVqtSAxrR4+ofzayuww0/EKamCjjnwnXTMRZzMudJoU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0/go.mod h1:IlaGLENJkAl9+Xoo3J0unkdOwtL+rmqZ3ryMjUtYA94= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0 h1:+tsVdWosoqDfX6cdHAeacZozjQS94ySBd+aUXFwnNKA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0/go.mod h1:jSqjV+Knu1Jyvh+l3fx7V210Ev3HHgNQAi8YqpXaQP8= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 h1:FXwvCIXsrMas/reQkSUTPZVCqud1yDy441acn4Fdu6w= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0/go.mod h1:TTDkohPFSX4LMcbmNMYDh0hMXV8YigEjw5WwD+nDn6U= -go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= -go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= -go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= -go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= -go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= +go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.20.0 h1:4s9HxB4azeeQkhY0GE5wZlMj4/pz8tE5gx2OQpGUw58= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.20.0/go.mod h1:djVA3TUJ2fSdMX0JE5XxFBOaZzprElJoP7fD4vnV2SU= +go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= +go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= +go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= +go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= +go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= +google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= From 66c9748b66ba0aa9d6727acc067a2eafa85c9ea6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:57:00 +0000 Subject: [PATCH 31/49] Bump golang.org/x/crypto from 0.15.0 to 0.17.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/crypto/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index ccea1a32..493734bc 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.20.0 go.opentelemetry.io/otel/sdk v1.20.0 go.opentelemetry.io/otel/trace v1.20.0 - golang.org/x/crypto v0.15.0 + golang.org/x/crypto v0.17.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -42,7 +42,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 go.opentelemetry.io/proto/otlp v1.0.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index e2857762..301cdc6c 100644 --- a/go.sum +++ b/go.sum @@ -64,15 +64,15 @@ go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lI go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= -golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 4b1264a558ad94c5d55150d49f476e97a16c52e6 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 10 Jan 2024 12:58:11 +0100 Subject: [PATCH 32/49] fix go build version --- .github/workflows/anx-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 04d40b90..878cbddb 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -44,7 +44,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.21 - name: Build run: go build . From dca37173cf05bdf648fd6ad7a2e60909201d5532 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 10 Jan 2024 13:07:43 +0100 Subject: [PATCH 33/49] fix ci --- .github/workflows/anx-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 878cbddb..6e2be5d3 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -29,7 +29,7 @@ jobs: # run: go test ./... -v -covermode=count publish: - # if: github.repository == ‘anexia/junos_exporter’ + if: github.repository == ‘anexia/junos_exporter’ # needs: test runs-on: ubuntu-latest env: From d22d294a08d73912d01d4e747334cb59c002d337 Mon Sep 17 00:00:00 2001 From: Gaste8 Date: Wed, 17 Jan 2024 11:07:08 +0100 Subject: [PATCH 34/49] Delete .github/workflows/anx-ci.yml --- .github/workflows/anx-ci.yml | 70 ------------------------------------ 1 file changed, 70 deletions(-) delete mode 100644 .github/workflows/anx-ci.yml diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml deleted file mode 100644 index 6e2be5d3..00000000 --- a/.github/workflows/anx-ci.yml +++ /dev/null @@ -1,70 +0,0 @@ -on: - push: - branches: - - anx-prod - pull_request: - branches: - - "**" - -name: anx-ci -jobs: - # test: - # # if: github.repository == ‘anexia/junos_exporter’ - # strategy: - # matrix: - # go-version: [1.18.x] - # platform: [ubuntu-latest, macos-latest, windows-latest] - # runs-on: ${{ matrix.platform }} - # steps: - # - name: Install Go - # if: success() - # uses: actions/setup-go@v3 - # with: - # go-version: ${{ matrix.go-version }} - # - name: Checkout code - # uses: actions/checkout@v3 - # - name: Build - # run: go build - # - name: Run tests - # run: go test ./... -v -covermode=count - - publish: - if: github.repository == ‘anexia/junos_exporter’ - # needs: test - runs-on: ubuntu-latest - env: - S3_URL: ${{ vars.S3_URL }} - S3_BUCKET: ${{ vars.S3_BUCKET }} - S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} - S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} - - steps: - - uses: actions/checkout@v3 - - - name: Set up Go - uses: actions/setup-go@v3 - with: - go-version: 1.21 - - - name: Build - run: go build . - - - uses: actions/upload-artifact@v3 - with: - name: junos_exporter - path: junos_exporter - - - uses: actions/setup-python@v4 - - - name: publish anx-prod to s3://$S3_BUCKET/public/junos_exporter/$GITHUB_REF_NAME/junos_exporter - run: | - pip install s4cmd - s4cmd --force put --endpoint-url https://$S3_URL junos_exporter s3://$S3_BUCKET/public/junos_exporter/$GITHUB_REF_NAME/junos_exporter - if: github.ref_type == 'tag' || github.ref == 'refs/heads/anx-prod' - - - name: "publish feature-branch to s3://$S3_BUCKET/public/junos_exporter/staging/junos_exporter" - run: | - pip install s4cmd - s4cmd --force put --endpoint-url https://$S3_URL -f junos_exporter s3://$S3_BUCKET/public/junos_exporter/staging/junos_exporter - # value only there if pull_request or pull_request_target - if: github.head_ref From 3d89b3e0b06376c38bcca31a64c4b2cfcc3119ef Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 10 Jan 2024 13:07:43 +0100 Subject: [PATCH 35/49] readd ci --- .github/workflows/anx-ci.yml | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/anx-ci.yml diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml new file mode 100644 index 00000000..6e2be5d3 --- /dev/null +++ b/.github/workflows/anx-ci.yml @@ -0,0 +1,70 @@ +on: + push: + branches: + - anx-prod + pull_request: + branches: + - "**" + +name: anx-ci +jobs: + # test: + # # if: github.repository == ‘anexia/junos_exporter’ + # strategy: + # matrix: + # go-version: [1.18.x] + # platform: [ubuntu-latest, macos-latest, windows-latest] + # runs-on: ${{ matrix.platform }} + # steps: + # - name: Install Go + # if: success() + # uses: actions/setup-go@v3 + # with: + # go-version: ${{ matrix.go-version }} + # - name: Checkout code + # uses: actions/checkout@v3 + # - name: Build + # run: go build + # - name: Run tests + # run: go test ./... -v -covermode=count + + publish: + if: github.repository == ‘anexia/junos_exporter’ + # needs: test + runs-on: ubuntu-latest + env: + S3_URL: ${{ vars.S3_URL }} + S3_BUCKET: ${{ vars.S3_BUCKET }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} + + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.21 + + - name: Build + run: go build . + + - uses: actions/upload-artifact@v3 + with: + name: junos_exporter + path: junos_exporter + + - uses: actions/setup-python@v4 + + - name: publish anx-prod to s3://$S3_BUCKET/public/junos_exporter/$GITHUB_REF_NAME/junos_exporter + run: | + pip install s4cmd + s4cmd --force put --endpoint-url https://$S3_URL junos_exporter s3://$S3_BUCKET/public/junos_exporter/$GITHUB_REF_NAME/junos_exporter + if: github.ref_type == 'tag' || github.ref == 'refs/heads/anx-prod' + + - name: "publish feature-branch to s3://$S3_BUCKET/public/junos_exporter/staging/junos_exporter" + run: | + pip install s4cmd + s4cmd --force put --endpoint-url https://$S3_URL -f junos_exporter s3://$S3_BUCKET/public/junos_exporter/staging/junos_exporter + # value only there if pull_request or pull_request_target + if: github.head_ref From 42950ffae6e1b1706bfe862675282bc60d2e9e4d Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 10:42:05 +0100 Subject: [PATCH 36/49] update ci --- .github/workflows/anx-ci.yml | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 6e2be5d3..8f106abf 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -8,29 +8,29 @@ on: name: anx-ci jobs: - # test: - # # if: github.repository == ‘anexia/junos_exporter’ - # strategy: - # matrix: - # go-version: [1.18.x] - # platform: [ubuntu-latest, macos-latest, windows-latest] - # runs-on: ${{ matrix.platform }} - # steps: - # - name: Install Go - # if: success() - # uses: actions/setup-go@v3 - # with: - # go-version: ${{ matrix.go-version }} - # - name: Checkout code - # uses: actions/checkout@v3 - # - name: Build - # run: go build - # - name: Run tests - # run: go test ./... -v -covermode=count + test: + if: github.repository == ‘anexia/junos_exporter’ + strategy: + matrix: + go-version: [1.21] + platform: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.platform }} + steps: + - name: Install Go + if: success() + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go-version }} + - name: Checkout code + uses: actions/checkout@v3 + - name: Build + run: go build + - name: Run tests + run: go test ./... -v -covermode=count publish: if: github.repository == ‘anexia/junos_exporter’ - # needs: test + needs: test runs-on: ubuntu-latest env: S3_URL: ${{ vars.S3_URL }} From cf88de4aad93fea3f384eaa2051af213c211609e Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 10:44:52 +0100 Subject: [PATCH 37/49] fix string hyphens --- .github/workflows/anx-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 8f106abf..f2a3c361 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -9,7 +9,7 @@ on: name: anx-ci jobs: test: - if: github.repository == ‘anexia/junos_exporter’ + if: github.repository == anexia/junos_exporter strategy: matrix: go-version: [1.21] @@ -29,7 +29,7 @@ jobs: run: go test ./... -v -covermode=count publish: - if: github.repository == ‘anexia/junos_exporter’ + if: github.repository == anexia/junos_exporter needs: test runs-on: ubuntu-latest env: From 74e56e80b02be506b2e566fd51b95ca77e83f78f Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 10:50:03 +0100 Subject: [PATCH 38/49] remove string --- .github/workflows/anx-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index f2a3c361..65c6ebf1 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -9,7 +9,6 @@ on: name: anx-ci jobs: test: - if: github.repository == anexia/junos_exporter strategy: matrix: go-version: [1.21] @@ -29,7 +28,6 @@ jobs: run: go test ./... -v -covermode=count publish: - if: github.repository == anexia/junos_exporter needs: test runs-on: ubuntu-latest env: From e875c6c113ab8c79936a05954c45dbba2579f31e Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 11:54:53 +0100 Subject: [PATCH 39/49] change build to use debian 11 (try to fix glibc version errror) --- .github/workflows/anx-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 65c6ebf1..98cd52ed 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -11,7 +11,7 @@ jobs: test: strategy: matrix: - go-version: [1.21] + go-version: ["1.21.x"] platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: @@ -30,6 +30,11 @@ jobs: publish: needs: test runs-on: ubuntu-latest + + # spin on debian 11 for the build in order to mirror our setup + container: + image: debian:bullseye + env: S3_URL: ${{ vars.S3_URL }} S3_BUCKET: ${{ vars.S3_BUCKET }} From 805b75193120e3772a16f34facd6d3d25327b662 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 12:00:44 +0100 Subject: [PATCH 40/49] fix ca-certificates --- .github/workflows/anx-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 98cd52ed..eb49947e 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -44,6 +44,13 @@ jobs: steps: - uses: actions/checkout@v3 + # Install ca-certificates package and update certificates + - name: Update CA certificates + run: | + apt-get update + apt-get install -y ca-certificates + update-ca-certificates + - name: Set up Go uses: actions/setup-go@v3 with: From d08143d7e36ac0bc08e60bae12bd9e31cb0d31a7 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 12:23:09 +0100 Subject: [PATCH 41/49] test out docker image --- .github/workflows/anx-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index eb49947e..a2a7db38 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -33,7 +33,7 @@ jobs: # spin on debian 11 for the build in order to mirror our setup container: - image: debian:bullseye + image: code.anexia.com:4567/si/anexia-common/docker-registry/python/base:3.11-1.7 env: S3_URL: ${{ vars.S3_URL }} From 698e59b8c55faa03638d3f51ed61faaad0e8b119 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 12:27:16 +0100 Subject: [PATCH 42/49] change to pthon bullseye --- .github/workflows/anx-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index a2a7db38..7cd249a8 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -33,7 +33,7 @@ jobs: # spin on debian 11 for the build in order to mirror our setup container: - image: code.anexia.com:4567/si/anexia-common/docker-registry/python/base:3.11-1.7 + image: python:bullseye env: S3_URL: ${{ vars.S3_URL }} From 4f83a562e0f721c7753ad8774879b55df28b6975 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 12:42:06 +0100 Subject: [PATCH 43/49] remove vcs information to resolve error --- .github/workflows/anx-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 7cd249a8..96562cf3 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -57,7 +57,7 @@ jobs: go-version: 1.21 - name: Build - run: go build . + run: go build -ldflags="-buildvcs=false" . - uses: actions/upload-artifact@v3 with: From 898ac291906ea765fc1dcd58f9448c5c7280c1eb Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 13:03:56 +0100 Subject: [PATCH 44/49] fix buildvcs --- .github/workflows/anx-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 96562cf3..88508ad8 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -57,7 +57,7 @@ jobs: go-version: 1.21 - name: Build - run: go build -ldflags="-buildvcs=false" . + run: go build -buildvcs=false . - uses: actions/upload-artifact@v3 with: From 0d57e5ef71003395b29863bebd7d049ac42b0dd3 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 13:40:44 +0100 Subject: [PATCH 45/49] try with CGO_LDFLAGS --- .github/workflows/anx-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 88508ad8..bb3bc06d 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -31,15 +31,12 @@ jobs: needs: test runs-on: ubuntu-latest - # spin on debian 11 for the build in order to mirror our setup - container: - image: python:bullseye - env: S3_URL: ${{ vars.S3_URL }} S3_BUCKET: ${{ vars.S3_BUCKET }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} + CGO_LDFLAGS: "-Xlinker -rpath=/lib/x86_64-linux-gnu" steps: - uses: actions/checkout@v3 From ca98b20b0a9fc05df3c9a0ea8cdc0ae5924c8bb1 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 13:44:56 +0100 Subject: [PATCH 46/49] remove ca --- .github/workflows/anx-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index bb3bc06d..f5bb0871 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -41,13 +41,6 @@ jobs: steps: - uses: actions/checkout@v3 - # Install ca-certificates package and update certificates - - name: Update CA certificates - run: | - apt-get update - apt-get install -y ca-certificates - update-ca-certificates - - name: Set up Go uses: actions/setup-go@v3 with: From d1fcc1d4cce5ddebe0425b77f12b8a59439d6fac Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 14:01:35 +0100 Subject: [PATCH 47/49] use ubuntu 20.04 --- .github/workflows/anx-ci.yml | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index f5bb0871..876cc84c 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -8,28 +8,28 @@ on: name: anx-ci jobs: - test: - strategy: - matrix: - go-version: ["1.21.x"] - platform: [ubuntu-latest, macos-latest, windows-latest] - runs-on: ${{ matrix.platform }} - steps: - - name: Install Go - if: success() - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go-version }} - - name: Checkout code - uses: actions/checkout@v3 - - name: Build - run: go build - - name: Run tests - run: go test ./... -v -covermode=count +# test: +# strategy: +# matrix: +# go-version: ["1.21.x"] +# platform: [ubuntu-latest, macos-latest, windows-latest] +# runs-on: ${{ matrix.platform }} +# steps: +# - name: Install Go +# if: success() +# uses: actions/setup-go@v3 +# with: +# go-version: ${{ matrix.go-version }} +# - name: Checkout code +# uses: actions/checkout@v3 +# - name: Build +# run: go build +# - name: Run tests +# run: go test ./... -v -covermode=count publish: - needs: test - runs-on: ubuntu-latest + # needs: test + runs-on: ubuntu-20.04 env: S3_URL: ${{ vars.S3_URL }} @@ -47,7 +47,7 @@ jobs: go-version: 1.21 - name: Build - run: go build -buildvcs=false . + run: go build . - uses: actions/upload-artifact@v3 with: From 852f9b565d093b6f126f5c93244cccdd14e7c017 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 14:01:57 +0100 Subject: [PATCH 48/49] delete linking option --- .github/workflows/anx-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 876cc84c..31493b00 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -36,7 +36,6 @@ jobs: S3_BUCKET: ${{ vars.S3_BUCKET }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} - CGO_LDFLAGS: "-Xlinker -rpath=/lib/x86_64-linux-gnu" steps: - uses: actions/checkout@v3 From 198d9051a424b36baeaa763ec8f8e6929c2ea9c7 Mon Sep 17 00:00:00 2001 From: Jakob Gastinger Date: Wed, 14 Feb 2024 14:58:15 +0100 Subject: [PATCH 49/49] finalize ci --- .github/workflows/anx-ci.yml | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/anx-ci.yml b/.github/workflows/anx-ci.yml index 31493b00..cbf3452e 100644 --- a/.github/workflows/anx-ci.yml +++ b/.github/workflows/anx-ci.yml @@ -8,27 +8,27 @@ on: name: anx-ci jobs: -# test: -# strategy: -# matrix: -# go-version: ["1.21.x"] -# platform: [ubuntu-latest, macos-latest, windows-latest] -# runs-on: ${{ matrix.platform }} -# steps: -# - name: Install Go -# if: success() -# uses: actions/setup-go@v3 -# with: -# go-version: ${{ matrix.go-version }} -# - name: Checkout code -# uses: actions/checkout@v3 -# - name: Build -# run: go build -# - name: Run tests -# run: go test ./... -v -covermode=count + test: + strategy: + matrix: + go-version: ["1.21.x"] + platform: [ubuntu-latest, macos-latest, windows-latest, ubuntu-20.04] + runs-on: ${{ matrix.platform }} + steps: + - name: Install Go + if: success() + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go-version }} + - name: Checkout code + uses: actions/checkout@v3 + - name: Build + run: go build + - name: Run tests + run: go test ./... -v -covermode=count publish: - # needs: test + needs: test runs-on: ubuntu-20.04 env: