Skip to content

Commit

Permalink
Add auto-discovery for Directory Services(MicrosoftAD)
Browse files Browse the repository at this point in the history
Signed-off-by: Ruslan Mustaev <[email protected]>
  • Loading branch information
RuslanMustaev committed Dec 3, 2024
1 parent 26c8bf8 commit 32599b7
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Only the latest version gets security updates. We won't support older versions.
* `AWS/Cognito` - Cognito
* `AWS/DataSync` - DataSync
* `AWS/DDoSProtection` - Distributed Denial of Service (DDoS) protection service
* `AWS/DirectoryService` - Directory Services (MicrosoftAD)
* `AWS/DMS` - Database Migration Service
* `AWS/DocDB` - DocumentDB (with MongoDB compatibility)
* `AWS/DX` - Direct Connect
Expand Down
19 changes: 19 additions & 0 deletions examples/ds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: v1alpha1
discovery:
jobs:
- type: AWS/DirectoryService
regions:
- us-east-1
period: 300
length: 300
metrics:
- name: "Bytes Sent/sec"
statistics: [Average]
- name: "% Processor Time"
statistics: [Average]
- name: "DS Directory Searches/Sec"
statistics: [Average]
- name: "Database Cache % Hit"
statistics: [Average]
- name: "% Free Space"
statistics: [Sum]
10 changes: 10 additions & 0 deletions pkg/config/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,16 @@ var SupportedServices = serviceConfigs{
regexp.MustCompile(":agent/(?P<AgentId>[^/]+)"),
},
},
{
Namespace: "AWS/DirectoryService",
Alias: "ds",
ResourceFilters: []*string{
aws.String("ds:directory"),
},
DimensionRegexps: []*regexp.Regexp{
regexp.MustCompile(":directory/(?P<Directory_ID>[^/]+)"),
},
},
{
Namespace: "AWS/DMS",
Alias: "dms",
Expand Down
61 changes: 61 additions & 0 deletions pkg/job/maxdimassociator/associator_ds_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package maxdimassociator

import (
"testing"

"github.com/stretchr/testify/require"

"github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/config"
"github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/logging"
"github.com/nerdswords/yet-another-cloudwatch-exporter/pkg/model"
)

var directory = &model.TaggedResource{
ARN: "arn:aws:ds::012345678901:directory/d-abc123",
Namespace: "AWS/DirectoryService",
}

func TestAssociatorDS(t *testing.T) {
type args struct {
dimensionRegexps []model.DimensionsRegexp
resources []*model.TaggedResource
metric *model.Metric
}

type testCase struct {
name string
args args
expectedSkip bool
expectedResource *model.TaggedResource
}

testcases := []testCase{
{
name: "should match Virtual Interface with VirtualInterfaceId dimension",
args: args{
dimensionRegexps: config.SupportedServices.GetService("AWS/DirectoryService").ToModelDimensionsRegexp(),
resources: []*model.TaggedResource{directory},
metric: &model.Metric{
MetricName: "Current Bandwidth",
Namespace: "AWS/DirectoryService",
Dimensions: []model.Dimension{
{Name: "Metric Category", Value: "NTDS"},
{Name: "Domain Controller IP", Value: "123.123.123.123"},
{Name: "Directory ID", Value: "d-abc123"},
},
},
},
expectedSkip: false,
expectedResource: directory,
},
}

for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
associator := NewAssociator(logging.NewNopLogger(), tc.args.dimensionRegexps, tc.args.resources)
res, skip := associator.AssociateMetricToResource(tc.args.metric)
require.Equal(t, tc.expectedSkip, skip)
require.Equal(t, tc.expectedResource, res)
})
}
}

0 comments on commit 32599b7

Please sign in to comment.