Backport: Allow Routing to Partial Monthly Client Count From Namespac…

…es (#13089) * changelog * add function for routing activity log client counts to ent namespaces
hashicorp · Nov 9, 2021 · 8aeba3a · 8aeba3a
1 parent 5038e92
commit 8aeba3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/changelog/13086.txt b/changelog/13086.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+activity log (enterprise): allow partial monthly client count to be accessed from namespaces
+```
diff --git a/vault/logical_system_activity.go b/vault/logical_system_activity.go
@@ -41,7 +41,7 @@ func (b *SystemBackend) activityQueryPath() *framework.Path {
 // monthlyActivityCountPath is available in every namespace
 func (b *SystemBackend) monthlyActivityCountPath() *framework.Path {
 	return &framework.Path{
-		Pattern:         "internal/counters/activity/monthly",
+		Pattern:         "internal/counters/activity/monthly$",
 		HelpSynopsis:    strings.TrimSpace(sysHelp["activity-monthly"][0]),
 		HelpDescription: strings.TrimSpace(sysHelp["activity-monthly"][1]),
 		Operations: map[logical.Operation]framework.OperationHandler{
@@ -53,6 +53,13 @@ func (b *SystemBackend) monthlyActivityCountPath() *framework.Path {
 	}
 }
 
+func (b *SystemBackend) activityPaths() []*framework.Path {
+	return []*framework.Path{
+		b.monthlyActivityCountPath(),
+		b.activityQueryPath(),
+	}
+}
+
 // rootActivityPaths are available only in the root namespace
 func (b *SystemBackend) rootActivityPaths() []*framework.Path {
 	return []*framework.Path{