Yuvipanda has submitted this change and it was merged.
Change subject: grafana: Fix paths for grafana datasource plugin
......................................................................
grafana: Fix paths for grafana datasource plugin
Change-Id: I092512305772a0ac3b3eb1903dd304776c80d47d
---
M modules/role/manifests/grafana/labs.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
diff --git a/modules/role/manifests/grafana/labs.pp
b/modules/role/manifests/grafana/labs.pp
index a2ad0ae..4c67030 100644
--- a/modules/role/manifests/grafana/labs.pp
+++ b/modules/role/manifests/grafana/labs.pp
@@ -22,10 +22,17 @@
}
# https://phabricator.wikimedia.org/T141636
+ # We clone this, but need to symlink into the 'dist' directory for plugin
to actually work
git::clone { 'operations/software/grafana/simple-json-datasource':
ensure => present,
branch => '3.0',
directory =>
'/usr/share/grafana/public/app/plugins/datasource/simple-json-datasource',
require => Package['grafana'],
}
+
+ file {
'/usr/share/grafana/public/app/plugins/datasource/datasource-plugin-genericdatasource':
+ ensure => link,
+ target =>
'/usr/share/grafana/public/app/plugins/datasource/simple-json-datasource/dist',
+ require =>
Git::Clone['operations/software/grafana/simple-json-datasource'],
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/313587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I092512305772a0ac3b3eb1903dd304776c80d47d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
