Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Move puppet repository cherrypick counter to diamond collector
......................................................................
Move puppet repository cherrypick counter to diamond collector
Bug: T132997
Change-Id: Ic8a846ed5cb4a49657db554b5eb74da42b9aeb35
---
M modules/beta/files/shinken.cfg
A modules/puppetmaster/files/cherry-pick-counter-collector.py
M modules/puppetmaster/files/git-sync-upstream
M modules/puppetmaster/manifests/gitsync.pp
4 files changed, 31 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/beta/files/shinken.cfg b/modules/beta/files/shinken.cfg
index b619a72..f95537b 100644
--- a/modules/beta/files/shinken.cfg
+++ b/modules/beta/files/shinken.cfg
@@ -66,7 +66,7 @@
service_description Long lived cherry-picks on puppetmaster
hostgroup_name role::beta::puppetmaster
use generic-service
- check_command
check_graphite_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.puppetmaster.cherrypicked_commits.ops-puppet!0!0!48h!100!--over
+ check_command
check_graphite_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.CherryPickCounterCollector.cherrypicked_commits.ops-puppet!0!0!48h!100!--over
}
define service {
diff --git a/modules/puppetmaster/files/cherry-pick-counter-collector.py
b/modules/puppetmaster/files/cherry-pick-counter-collector.py
new file mode 100644
index 0000000..e5dc18e
--- /dev/null
+++ b/modules/puppetmaster/files/cherry-pick-counter-collector.py
@@ -0,0 +1,18 @@
+# coding=utf8
+"Collect cherry pick count for operations/puppet"
+import subprocess
+import diamond.collector
+
+
+class CherryPickCounterCollector(diamond.collector.Collector):
+ def collect(self):
+ lines = subprocess.check_output([
+ '/usr/bin/sudo',
+ '/usr/bin/git',
+ '--git-dir=/var/lib/git/operations/puppet/.git',
+ 'log',
+ '--pretty=oneline',
+ '--abbrev-commit',
+ 'origin/HEAD..HEAD'
+ ]).splitlines()
+ self.publish('cherrypicked_commits.ops-puppet', len(lines))
diff --git a/modules/puppetmaster/files/git-sync-upstream
b/modules/puppetmaster/files/git-sync-upstream
index e7b3dfd..585714d 100644
--- a/modules/puppetmaster/files/git-sync-upstream
+++ b/modules/puppetmaster/files/git-sync-upstream
@@ -56,12 +56,6 @@
echo "Local hacks:"
git log --color --pretty=oneline --abbrev-commit origin/HEAD..HEAD |
sed 's/^/ /'
-
- # Send stats on how many cherry-picked commits there are to statsd
- STATS_PREFIX="`cat /etc/wmflabs-project`.`cat /etc/wmflabs-instancename`"
- CHERRY_PICKED_COUNT=`git log --pretty=oneline --abbrev-commit
origin/HEAD..HEAD | wc -l`
- echo -n
"${STATS_PREFIX}.puppetmaster.cherrypicked_commits.${REPO_NAME}:${CHERRY_PICKED_COUNT}|g"
|
- nc -w 1 -u ${STATSD_HOST} 8125
}
rebase_repo ops-puppet /var/lib/git/operations/puppet production
diff --git a/modules/puppetmaster/manifests/gitsync.pp
b/modules/puppetmaster/manifests/gitsync.pp
index 8784e36..e19da77 100644
--- a/modules/puppetmaster/manifests/gitsync.pp
+++ b/modules/puppetmaster/manifests/gitsync.pp
@@ -29,4 +29,16 @@
group => 'root',
mode => '0444',
}
+
+ sudo::user { 'cherry_pick_count':
+ ensure => present,
+ user => 'diamond',
+ privileges => [ 'ALL = (root) NOPASSWD: /usr/bin/git
--git-dir=/var/lib/git/operations/puppet/.git log --pretty=oneline
--abbrev-commit origin/HEAD..HEAD' ]
+ }
+
+ diamond::collector { 'CherryPickCounter':
+ ensure => present,
+ source =>
'puppet:///modules/puppetmaster/cherry-pick-counter-collector.py',
+ require => Sudo::User['cherry_pick_count']
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/286226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8a846ed5cb4a49657db554b5eb74da42b9aeb35
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
