Filippo Giunchedi has submitted this change and it was merged.
Change subject: Remove clear-profile script and documentation
......................................................................
Remove clear-profile script and documentation
Ori pointed out during review of I120cc55 that this script no longer
does anything useful.
Change-Id: I359c7840f3a909a43bc2e316952346c54598ebf5
---
D modules/scap/files/clear-profile
D modules/scap/files/manpages/asciidoc/clear-profile.txt
D modules/scap/files/manpages/man/clear-profile.8
M modules/scap/manifests/scripts.pp
4 files changed, 5 insertions(+), 114 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/scap/files/clear-profile b/modules/scap/files/clear-profile
deleted file mode 100755
index c851ee0..0000000
--- a/modules/scap/files/clear-profile
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Ensure that $LOGNAME is set and has a non-null value.
-LOGNAME=${LOGNAME:-$(logname)}
-
-echo "-truncate" | nc -q0 -u statsd.eqiad.wmnet 3811
-/usr/local/bin/dologmsg "!log $LOGNAME@$HOSTNAME cleared profiling data"
diff --git a/modules/scap/files/manpages/asciidoc/clear-profile.txt
b/modules/scap/files/manpages/asciidoc/clear-profile.txt
deleted file mode 100644
index 2dc674a..0000000
--- a/modules/scap/files/manpages/asciidoc/clear-profile.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-:man source: Puppet
-:man version: 1.0
-:man manual: Wikimedia Manual
-
-clear-profile(8)
-==============
-:doctype: manpage
-
-NAME
-----
-
-clear-profile - delete graphite profiling data
-
-SYNOPSIS
---------
-
-[verse]
-'clear-profile'
-
-DESCRIPTION
------------
-
-The `clear-profile` script will ping the graphite installation and ask it
-to remove the profiling data.
-
-OPTIONS
--------
-This script has no options.
-
-COMMANDS
---------
-Describe commands, you can give some synopsis there such as:
-
- clear-profile
-
-BUGS
-----
-
-This script does not handle any error while sending the ping back and
-always assumes the command worked successfuly.
-
-RESOURCES
----------
-
-https://wikitech.wikimedia.org/view/Graphite
-
-// For vim users:
-// Syntax file is availaible on github at:
-// https://github.com/dagwieers/asciidoc-vim
-// vim: set syntax=asciidoc:
diff --git a/modules/scap/files/manpages/man/clear-profile.8
b/modules/scap/files/manpages/man/clear-profile.8
deleted file mode 100644
index ceb8d43..0000000
--- a/modules/scap/files/manpages/man/clear-profile.8
+++ /dev/null
@@ -1,52 +0,0 @@
-'\" t
-.\" Title: clear-profile
-.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 10/01/2012
-.\" Manual: Wikimedia Manual
-.\" Source: Puppet 1.0
-.\" Language: English
-.\"
-.TH "CLEAR\-PROFILE" "8" "10/01/2012" "Puppet 1\&.0" "Wikimedia Manual"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-clear-profile \- delete graphite profiling data
-.SH "SYNOPSIS"
-.sp
-.nf
-\fIclear\-profile\fR
-.fi
-.SH "DESCRIPTION"
-.sp
-The clear\-profile script will ping the graphite installation and ask it to
remove the profiling data\&.
-.SH "OPTIONS"
-.sp
-This script has no options\&.
-.SH "COMMANDS"
-.sp
-Describe commands, you can give some synopsis there such as:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-clear\-profile
-.fi
-.if n \{\
-.RE
-.\}
-.SH "BUGS"
-.sp
-This script does not handle any error while sending the ping back and always
assumes the command worked successfuly\&.
-.SH "RESOURCES"
-.sp
-https://wikitech\&.wikimedia\&.org/view/Graphite
diff --git a/modules/scap/manifests/scripts.pp
b/modules/scap/manifests/scripts.pp
index 0b64e00..6fea8fb 100644
--- a/modules/scap/manifests/scripts.pp
+++ b/modules/scap/manifests/scripts.pp
@@ -9,12 +9,6 @@
require misc::deployment::passwordscripts
require mediawiki::users
- file { '/usr/local/bin/clear-profile':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/clear-profile',
- }
file { '/usr/local/bin/dologmsg':
owner => 'root',
group => 'root',
@@ -127,4 +121,9 @@
mode => '0444',
content => template('scap/mw-deployment-vars.erb'),
}
+
+ # Clean up old cruft
+ file { '/usr/local/bin/clear-profile':
+ ensure => 'absent',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/229322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I359c7840f3a909a43bc2e316952346c54598ebf5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
