Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use HostInfo to populate instanceId, InstanceType #229

Merged
merged 2 commits into from
Aug 30, 2024
Merged

Use HostInfo to populate instanceId, InstanceType #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a10ecbe
Use HostInfo to populate instanceId, InstanceType
sam6134 Aug 28, 2024
2080439
Fix lint for scraper test
sam6134 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions receiver/awscontainerinsightreceiver/internal/neuron/neuron_monitor_scraper_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ func GetNeuronMetricRelabelConfigs(hostinfo prometheusscraper.HostInfoProvider)
SourceLabels: model.LabelNames{"instance_id"},
TargetLabel: ci.InstanceID,
Regex: relabel.MustNewRegexp("(.*)"),
Replacement: "${1}",
Replacement: hostinfo.GetInstanceID(),
Action: relabel.Replace,
},
{
SourceLabels: model.LabelNames{"instance_type"},
TargetLabel: ci.InstanceType,
Regex: relabel.MustNewRegexp("(.*)"),
Replacement: "${1}",
Replacement: hostinfo.GetInstanceType(),
Action: relabel.Replace,
},
{
Expand Down
17 changes: 11 additions & 6 deletions receiver/awscontainerinsightreceiver/internal/neuron/neuron_monitor_scraper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ hardware_ecc_events_total{availability_zone="us-east-1c",event_type="sram_ecc_un
const dummyClusterName = "cluster-name"
const dummyHostName = "i-000000000"
const dummyNodeName = "dummy-nodeName"
const dummyInstanceType = "instance-type"

type mockHostInfoProvider struct {
}
Expand All @@ -51,13 +52,17 @@ func (m mockHostInfoProvider) GetInstanceID() string {
return dummyHostName
}

func (m mockHostInfoProvider) GetInstanceType() string {
return dummyInstanceType
}

func TestNewNeuronScraperEndToEnd(t *testing.T) {
t.Setenv("HOST_NAME", dummyNodeName)
expectedMetrics := make(map[string]prometheusscraper.ExpectedMetricStruct)
expectedMetrics["neuroncore_utilization_ratio"] = prometheusscraper.ExpectedMetricStruct{
MetricValue: 0.1,
MetricLabels: []prometheusscraper.MetricLabel{
{LabelName: "InstanceId", LabelValue: "i-09db9b55e0095612f"},
{LabelName: "InstanceId", LabelValue: dummyHostName},
{LabelName: "ClusterName", LabelValue: dummyClusterName},
{LabelName: "NeuronCore", LabelValue: "0"},
{LabelName: "NodeName", LabelValue: dummyNodeName},
Expand All @@ -66,7 +71,7 @@ func TestNewNeuronScraperEndToEnd(t *testing.T) {
expectedMetrics["neurondevice_hw_ecc_events_total_mem_ecc_corrected"] = prometheusscraper.ExpectedMetricStruct{
MetricValue: 3,
MetricLabels: []prometheusscraper.MetricLabel{
{LabelName: "InstanceId", LabelValue: "i-09db9b55e0095612f"},
{LabelName: "InstanceId", LabelValue: dummyHostName},
{LabelName: "ClusterName", LabelValue: dummyClusterName},
{LabelName: "NeuronDevice", LabelValue: "5"},
{LabelName: "NodeName", LabelValue: dummyNodeName},
Expand All @@ -75,7 +80,7 @@ func TestNewNeuronScraperEndToEnd(t *testing.T) {
expectedMetrics["neuron_runtime_memory_used_bytes"] = prometheusscraper.ExpectedMetricStruct{
MetricValue: 9.043968e+06,
MetricLabels: []prometheusscraper.MetricLabel{
{LabelName: "InstanceId", LabelValue: "i-09db9b55e0095612f"},
{LabelName: "InstanceId", LabelValue: dummyHostName},
{LabelName: "ClusterName", LabelValue: dummyClusterName},
{LabelName: "NodeName", LabelValue: dummyNodeName},
},
Expand All @@ -84,7 +89,7 @@ func TestNewNeuronScraperEndToEnd(t *testing.T) {
expectedMetrics["execution_errors_created"] = prometheusscraper.ExpectedMetricStruct{
MetricValue: 1.7083389404380567e+09,
MetricLabels: []prometheusscraper.MetricLabel{
{LabelName: "InstanceId", LabelValue: "i-09db9b55e0095612f"},
{LabelName: "InstanceId", LabelValue: dummyHostName},
{LabelName: "ClusterName", LabelValue: dummyClusterName},
{LabelName: "NodeName", LabelValue: dummyNodeName},
},
Expand All @@ -93,7 +98,7 @@ func TestNewNeuronScraperEndToEnd(t *testing.T) {
expectedMetrics["system_memory_total_bytes"] = prometheusscraper.ExpectedMetricStruct{
MetricValue: 5.32523487232e+011,
MetricLabels: []prometheusscraper.MetricLabel{
{LabelName: "InstanceId", LabelValue: "i-09db9b55e0095612f"},
{LabelName: "InstanceId", LabelValue: dummyHostName},
{LabelName: "ClusterName", LabelValue: dummyClusterName},
{LabelName: "NodeName", LabelValue: dummyNodeName},
},
Expand All @@ -102,7 +107,7 @@ func TestNewNeuronScraperEndToEnd(t *testing.T) {
expectedMetrics["hardware_ecc_events_total"] = prometheusscraper.ExpectedMetricStruct{
MetricValue: 864.0,
MetricLabels: []prometheusscraper.MetricLabel{
{LabelName: "InstanceId", LabelValue: "i-09db9b55e0095612f"},
{LabelName: "InstanceId", LabelValue: dummyHostName},
{LabelName: "ClusterName", LabelValue: dummyClusterName},
{LabelName: "NodeName", LabelValue: dummyNodeName},
},
Expand Down
1 change: 1 addition & 0 deletions receiver/awscontainerinsightreceiver/internal/prometheusscraper/simple_prometheus_scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ type SimplePrometheusScraperOpts struct {
type HostInfoProvider interface {
GetClusterName() string
GetInstanceID() string
GetInstanceType() string
}

func NewSimplePrometheusScraper(opts SimplePrometheusScraperOpts) (*SimplePrometheusScraper, error) {
Expand Down
4 changes: 4 additions & 0 deletions .../awscontainerinsightreceiver/internal/prometheusscraper/simple_prometheus_scraper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ func (m mockHostInfoProvider) GetInstanceID() string {
return "i-000000000"
}

func (m mockHostInfoProvider) GetInstanceType() string {
return "instance-type"
}

func TestSimplePrometheusScraperBadInputs(t *testing.T) {
settings := componenttest.NewNopTelemetrySettings()
settings.Logger, _ = zap.NewDevelopment()
Expand Down
Loading