Merge pull request #192 from m0dular/SUP-4126-file_sync_storage

elainemccloskey · web-flow · commit 39dd7b2e1cb9 · 2023-04-05T17:40:14.000+01:00
(SUP-4126) Fix file sync additional metrics
diff --git a/manifests/service/puppetserver.pp b/manifests/service/puppetserver.pp
@@ -25,17 +25,17 @@
     {
       'type'  => 'read',
       'name'  => 'file-sync-storage-commit-timer',
-      'mbean' => 'puppetserver:name=puppetlabs.puppet.file-sync-storage.commit-timer'
+      'mbean' => 'puppetserver:name=puppetlabs.*.file-sync-storage.commit-timer'
     },
     {
       'type'  => 'read',
       'name'  => 'file-sync-storage-pre-commit-hook-timer',
-      'mbean' => 'puppetserver:name=puppetlabs.puppet.file-sync-storage.pre-commit-hook-timer'
+      'mbean' => 'puppetserver:name=puppetlabs.*.file-sync-storage.pre-commit-hook-timer'
     },
     {
       'type' => 'read',
       'name' => 'file-sync-storage-commit-add-rm-timer',
-      'mbean' => 'puppetserver:name=puppetlabs.puppet.file-sync-storage.commit-add-rm-timer'
+      'mbean' => 'puppetserver:name=puppetlabs.*.file-sync-storage.commit-add-rm-timer'
     },
   ]
 

Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,17 @@`
`25`	`25`	`{`
`26`	`26`	`'type' => 'read',`
`27`	`27`	`'name' => 'file-sync-storage-commit-timer',`
`28`		`- 'mbean' => 'puppetserver:name=puppetlabs.puppet.file-sync-storage.commit-timer'`
	`28`	`+ 'mbean' => 'puppetserver:name=puppetlabs.*.file-sync-storage.commit-timer'`
`29`	`29`	`},`
`30`	`30`	`{`
`31`	`31`	`'type' => 'read',`
`32`	`32`	`'name' => 'file-sync-storage-pre-commit-hook-timer',`
`33`		`- 'mbean' => 'puppetserver:name=puppetlabs.puppet.file-sync-storage.pre-commit-hook-timer'`
	`33`	`+ 'mbean' => 'puppetserver:name=puppetlabs.*.file-sync-storage.pre-commit-hook-timer'`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`'type' => 'read',`
`37`	`37`	`'name' => 'file-sync-storage-commit-add-rm-timer',`
`38`		`- 'mbean' => 'puppetserver:name=puppetlabs.puppet.file-sync-storage.commit-add-rm-timer'`
	`38`	`+ 'mbean' => 'puppetserver:name=puppetlabs.*.file-sync-storage.commit-add-rm-timer'`
`39`	`39`	`},`
`40`	`40`	`]`
`41`	`41`