Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314029
Change subject: Enabled simple-json-datasource on prod Grafana
......................................................................
Enabled simple-json-datasource on prod Grafana
Bug: T147329
Change-Id: I9b99d9fd394b1cc88e9c62f0d33bf55a7b33a06f
---
M modules/role/manifests/grafana/base.pp
M modules/role/manifests/grafana/labs.pp
2 files changed, 15 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/314029/1
diff --git a/modules/role/manifests/grafana/base.pp
b/modules/role/manifests/grafana/base.pp
index e27d166..d4f2e58 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -196,4 +196,19 @@
backup::set { 'var-lib-grafana':
require => Class['::grafana'],
}
+
+ # https://phabricator.wikimedia.org/T147329
+ # 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'],
+ }
}
diff --git a/modules/role/manifests/grafana/labs.pp
b/modules/role/manifests/grafana/labs.pp
index 4c67030..03484e8 100644
--- a/modules/role/manifests/grafana/labs.pp
+++ b/modules/role/manifests/grafana/labs.pp
@@ -21,18 +21,4 @@
]
}
- # 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/314029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b99d9fd394b1cc88e9c62f0d33bf55a7b33a06f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
