Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/52936
Change subject: hopefully this works for change https://gerrit.wikimedia.org/r/#/c/8344/5 Merge branch 'ircecho' into production ...................................................................... hopefully this works for change https://gerrit.wikimedia.org/r/#/c/8344/5 Merge branch 'ircecho' into production Conflicts: manifests/gerrit.pp manifests/misc-servers.pp manifests/misc/wikibugs.pp manifests/openstack.pp manifests/site.pp Change-Id: Iea37035ea03d11165992d1d14dc76f6ab48f3f8c --- M manifests/gerrit.pp M manifests/misc-servers.pp M manifests/misc/wikibugs.pp M manifests/openstack.pp M manifests/site.pp 5 files changed, 6 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/36/52936/1 diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp index 467e48e..1cf598f 100644 --- a/manifests/gerrit.pp +++ b/manifests/gerrit.pp @@ -333,9 +333,9 @@ class gerrit::ircbot { -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) $ircecho_infile = "/var/lib/gerrit2/review_site/logs/operations.log:#wikimedia-operations;/var/lib/gerrit2/review_site/logs/labs.log:#wikimedia-labs;/var/lib/gerrit2/review_site/logs/mobile.log:#wikimedia-mobile;/var/lib/gerrit2/review_site/logs/parsoid.log:#mediawiki-parsoid;/var/lib/gerrit2/review_site/logs/visualeditor.log:#mediawiki-visualeditor;/var/lib/gerrit2/review_site/logs/mediawiki.log:#mediawiki;/var/lib/gerrit2/review_site/logs/wikimedia-dev.log:#wikimedia-dev;/var/lib/gerrit2/review_site/logs/semantic-mediawiki.log:#semantic-mediawiki,#mediawiki;/var/lib/gerrit2/review_site/logs/wikidata.log:#wikimedia-wikidata" -======= + $ircecho_nick = "gerrit-wm" + $ircecho_chans = "#wikimedia-operations,#wikimedia-labs,#wikimedia-mobile,#mediawiki-parsoid,#mediawiki-visualeditor,#mediawiki,#wikimedia-dev,#wikimedia-wikidata,#semantic-mediawiki" #target channels can be either strings or arrays. #channels names will get a # prepended if it doesn't already start with one $ircecho_logbase = "/var/lib/gerrit2/review_site/logs" @@ -348,12 +348,6 @@ "${ircecho_logbase}/semantic-mediawiki.log" => [ "semantic-mediawiki", "mediawiki", ], "${ircecho_logbase}/wikidata.log" => [ "wikimedia-wikidata", "mediawiki", ], } ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) - $ircecho_nick = "gerrit-wm" -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) - $ircecho_chans = "#wikimedia-operations,#wikimedia-labs,#wikimedia-mobile,#mediawiki-parsoid,#mediawiki-visualeditor,#mediawiki,#wikimedia-dev,#wikimedia-wikidata,#semantic-mediawiki" -======= ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) $ircecho_server = "irc.freenode.net" package { ['ircecho']: diff --git a/manifests/misc-servers.pp b/manifests/misc-servers.pp index 479f766..d619c46 100644 --- a/manifests/misc-servers.pp +++ b/manifests/misc-servers.pp @@ -1,5 +1,3 @@ -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) -======= # misc-servers.pp # Resource definitions for miscellaneous servers @@ -972,4 +970,3 @@ iptables_add_exec{ "iron": service => "iron" } } ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp index abec31b..eabda14 100644 --- a/manifests/misc/wikibugs.pp +++ b/manifests/misc/wikibugs.pp @@ -19,22 +19,16 @@ # Some Bugzilla product have been blessed with their own log files out of the # default one. Values are hardcoded in the Wikibugs perl script -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) $ircecho_infile = '/var/lib/wikibugs/logs/wikimedia-labs.log:#wikimedia-labs;/var/lib/wikibugs/logs/wikimedia-mobile.log:#wikimedia-mobile;/var/lib/wikibugs/logs/mediawiki.log:#mediawiki-feed' -======= + $ircecho_nick = "wikibugs" + # Add channels defined in $ircecho_infile: + $ircecho_chans = '#wikimedia-labs,#wikimedia-mobile,#mediawiki-feed' $ircecho_logbase = '/var/lib/wikibugs/logs' $ircecho_logs = { "${ircecho_logbase}/wikimedia-labs.log" => '#wikimedia-labs', "${ircecho_logbase}/wikimedia-mobile.log" => '#wikimedia-mobile', "${ircecho_logbase}/mediawiki.log" => '#mediawiki', } ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) - $ircecho_nick = "wikibugs" -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) - # Add channels defined in $ircecho_infile: - $ircecho_chans = '#wikimedia-labs,#wikimedia-mobile,#mediawiki-feed' -======= ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) $ircecho_server = 'irc.freenode.net' include misc::ircecho diff --git a/manifests/openstack.pp b/manifests/openstack.pp index 8ac9a90..c876f93 100644 --- a/manifests/openstack.pp +++ b/manifests/openstack.pp @@ -164,14 +164,10 @@ } } -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) -class openstack::project-storage-service { - $ircecho_infile = "/var/lib/glustermanager/manage-volumes.log" -======= class openstack::project-storage-cron { $ircecho_logs = { "/var/lib/glustermanager/manage-volumes.log" => "wikimedia-labs" } ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) $ircecho_nick = "labs-storage-wm" + $ircecho_infile = "/var/lib/glustermanager/manage-volumes.log" $ircecho_server = "irc.freenode.net" package { "ircecho": diff --git a/manifests/site.pp b/manifests/site.pp index 8050401..9667542 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -682,10 +682,7 @@ $ircecho_logs = { "/var/log/logmsg" => "#wikimedia-tech" } $ircecho_nick = "logmsgbot" -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) $ircecho_chans = "#wikimedia-operations" -======= ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) $ircecho_server = "irc.freenode.net" include role::applicationserver::maintenance, @@ -1713,11 +1710,8 @@ node "neon.wikimedia.org" { $domain_search = "wikimedia.org pmtpa.wmnet eqiad.wmnet esams.wikimedia.org" -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) $ircecho_infile = "/var/log/icinga/irc.log" -======= $ircecho_logs = { "/var/log/nagios/irc.log" => "#wikimedia-operations" } ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) $ircecho_nick = "icinga-wm" $ircecho_server = "irc.freenode.net" include standard, @@ -2118,14 +2112,11 @@ node "spence.wikimedia.org" { $ganglia_aggregator = "true" -<<<<<<< HEAD (9a25d7 ensuring /etc/icinga exists) -======= $nagios_server = "true" $ircecho_logs = { "/var/log/nagios/irc.log" => "#wikimedia-operations" } $ircecho_nick = "nagios-wm" $ircecho_server = "irc.freenode.net" ->>>>>>> BRANCH (1ef7f4 make ircecho config sane (not just very long strings)) include standard, nfs::netapp::home, -- To view, visit https://gerrit.wikimedia.org/r/52936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea37035ea03d11165992d1d14dc76f6ab48f3f8c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
