diff options
17 files changed, 30 insertions, 573 deletions
diff --git a/lib/leap_cli/commands/db.rb b/lib/leap_cli/commands/db.rb index 5307ac4d..227d429d 100644 --- a/lib/leap_cli/commands/db.rb +++ b/lib/leap_cli/commands/db.rb @@ -50,7 +50,7 @@ module LeapCli; module Commands def destroy_all_dbs(nodes) ssh_connect(nodes) do |ssh| - ssh.run('/etc/init.d/bigcouch stop && test ! -z "$(ls /opt/bigcouch/var/lib/ 2> /dev/null)" && rm -r /opt/bigcouch/var/lib/* && echo "All DBs destroyed" || echo "DBs already destroyed"') + ssh.run('/etc/init.d/couchdb stop && test ! -z "$(ls /var/lib/couchdb 2> /dev/null)" && rm -r /var/lib/couchdb/* && echo "All DBs destroyed" || echo "DBs already destroyed"') end end diff --git a/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg b/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg deleted file mode 100644 index 0f378a5a..00000000 --- a/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg +++ /dev/null @@ -1,28 +0,0 @@ -/opt/bigcouch/var/log/bigcouch.log nocontext=1 -# ignore requests that are fine - I undefined - -.*200$ - I undefined - -.*201$ - I 127.0.0.1 undefined.* ok - I 127.0.0.1 localhost:5984 .* ok - # https://leap.se/code/issues/5246 - I Shutting down group server - # ignore bigcouch conflict errors - I Error in process.*{{nocatch,conflict} - # ignore "Uncaught error in HTTP request: {exit, normal}" error - # it's suppressed in later versions of bigcouch anhow - # see https://leap.se/code/issues/5226 - I Uncaught error in HTTP request: {exit,normal} - I Uncaught error in HTTP request: {exit, - # Ignore rexi_EXIT bigcouch error (Bug #6512) - I Error in process <[0-9.]+> on node .* with exit value: {{rexi_EXIT,{(killed|noproc|shutdown),\[{couch_db,collect_results - # Ignore "Generic server terminating" bigcouch message (Feature #6544) - I Generic server <.*> terminating - I {error_report,<.*>, - I {error_info, - C Uncaught error in HTTP request: {error, - C Response abnormally terminated: {nodedown, - C rexi_DOWN,noproc - C rexi_DOWN,noconnection - C error - C Connection attempt from disallowed node - W Apache CouchDB has started diff --git a/puppet/modules/site_check_mk/files/agent/nagios_plugins/check_unix_open_fds.pl b/puppet/modules/site_check_mk/files/agent/nagios_plugins/check_unix_open_fds.pl deleted file mode 100755 index 06163d49..00000000 --- a/puppet/modules/site_check_mk/files/agent/nagios_plugins/check_unix_open_fds.pl +++ /dev/null @@ -1,322 +0,0 @@ -#!/usr/bin/perl -w - -# check_unix_open_fds Nagios Plugin -# -# TComm - Carlos Peris Pla -# -# This nagios plugin is free software, and comes with ABSOLUTELY -# NO WARRANTY. It may be used, redistributed and/or modified under -# the terms of the GNU General Public Licence (see -# http://www.fsf.org/licensing/licenses/gpl.txt). - - -# MODULE DECLARATION - -use strict; -use Nagios::Plugin; - - -# FUNCTION DECLARATION - -sub CreateNagiosManager (); -sub CheckArguments (); -sub PerformCheck (); - - -# CONSTANT DEFINITION - -use constant NAME => 'check_unix_open_fds'; -use constant VERSION => '0.1b'; -use constant USAGE => "Usage:\ncheck_unix_open_fds -w <process_threshold,application_threshold> -c <process_threshold,application_threshold>\n". - "\t\t[-V <version>]\n"; -use constant BLURB => "This plugin checks, in UNIX systems with the command lsof installed and with its SUID bit activated, the number\n". - "of file descriptors opened by an application and its processes.\n"; -use constant LICENSE => "This nagios plugin is free software, and comes with ABSOLUTELY\n". - "no WARRANTY. It may be used, redistributed and/or modified under\n". - "the terms of the GNU General Public Licence\n". - "(see http://www.fsf.org/licensing/licenses/gpl.txt).\n"; -use constant EXAMPLE => "\n\n". - "Example:\n". - "\n". - "check_unix_open_fds -a /usr/local/nagios/bin/ndo2db -w 20,75 -c 25,85\n". - "\n". - "It returns CRITICAL if number of file descriptors opened by ndo2db is higher than 85,\n". - "if not it returns WARNING if number of file descriptors opened by ndo2db is higher \n". - "than 75, if not it returns CRITICAL if number of file descriptors opened by any process\n". - "of ndo2db is higher than 25, if not it returns WARNING if number of file descriptors \n". - "opened by any process of ndo2db is higher than 20.\n". - "In other cases it returns OK if check has been performed succesfully.\n\n"; - - -# VARIABLE DEFINITION - -my $Nagios; -my $Error; -my $PluginResult; -my $PluginOutput; -my @WVRange; -my @CVRange; - - -# MAIN FUNCTION - -# Get command line arguments -$Nagios = &CreateNagiosManager(USAGE, VERSION, BLURB, LICENSE, NAME, EXAMPLE); -eval {$Nagios->getopts}; - -if (!$@) { - # Command line parsed - if (&CheckArguments($Nagios, \$Error, \@WVRange, \@CVRange)) { - # Argument checking passed - $PluginResult = &PerformCheck($Nagios, \$PluginOutput, \@WVRange, \@CVRange) - } - else { - # Error checking arguments - $PluginOutput = $Error; - $PluginResult = UNKNOWN; - } - $Nagios->nagios_exit($PluginResult,$PluginOutput); -} -else { - # Error parsing command line - $Nagios->nagios_exit(UNKNOWN,$@); -} - - - -# FUNCTION DEFINITIONS - -# Creates and configures a Nagios plugin object -# Input: strings (usage, version, blurb, license, name and example) to configure argument parsing functionality -# Return value: reference to a Nagios plugin object - -sub CreateNagiosManager() { - # Create GetOpt object - my $Nagios = Nagios::Plugin->new(usage => $_[0], version => $_[1], blurb => $_[2], license => $_[3], plugin => $_[4], extra => $_[5]); - - # Add argument units - $Nagios->add_arg(spec => 'application|a=s', - help => 'Application path for which you want to check the number of open file descriptors', - required => 1); - - # Add argument warning - $Nagios->add_arg(spec => 'warning|w=s', - help => "Warning thresholds. Format: <process_threshold,application_threshold>", - required => 1); - # Add argument critical - $Nagios->add_arg(spec => 'critical|c=s', - help => "Critical thresholds. Format: <process_threshold,application_threshold>", - required => 1); - - # Return value - return $Nagios; -} - - -# Checks argument values and sets some default values -# Input: Nagios Plugin object -# Output: reference to Error description string, Memory Unit, Swap Unit, reference to WVRange ($_[4]), reference to CVRange ($_[5]) -# Return value: True if arguments ok, false if not - -sub CheckArguments() { - my ($Nagios, $Error, $WVRange, $CVRange) = @_; - my $commas; - my $units; - my $i; - my $firstpos; - my $secondpos; - - # Check Warning thresholds list - $commas = $Nagios->opts->warning =~ tr/,//; - if ($commas !=1){ - ${$Error} = "Invalid Warning list format. One comma is expected."; - return 0; - } - else{ - $i=0; - $firstpos=0; - my $warning=$Nagios->opts->warning; - while ($warning =~ /[,]/g) { - $secondpos=pos $warning; - if ($secondpos - $firstpos==1){ - @{$WVRange}[$i] = "~:"; - } - else{ - @{$WVRange}[$i] = substr $Nagios->opts->warning, $firstpos, ($secondpos-$firstpos-1); - } - $firstpos=$secondpos; - $i++ - } - if (length($Nagios->opts->warning) - $firstpos==0){#La coma es el ultimo elemento del string - @{$WVRange}[$i] = "~:"; - } - else{ - @{$WVRange}[$i] = substr $Nagios->opts->warning, $firstpos, (length($Nagios->opts->warning)-$firstpos); - } - - if (@{$WVRange}[0] !~/^(@?(\d+|(\d+|~):(\d+)?))?$/){ - ${$Error} = "Invalid Process Warning threshold in ${$WVRange[0]}"; - return 0; - }if (@{$WVRange}[1] !~/^(@?(\d+|(\d+|~):(\d+)?))?$/){ - ${$Error} = "Invalid Application Warning threshold in ${$WVRange[1]}"; - return 0; - } - } - - # Check Critical thresholds list - $commas = $Nagios->opts->critical =~ tr/,//; - if ($commas !=1){ - ${$Error} = "Invalid Critical list format. One comma is expected."; - return 0; - } - else{ - $i=0; - $firstpos=0; - my $critical=$Nagios->opts->critical; - while ($critical =~ /[,]/g) { - $secondpos=pos $critical ; - if ($secondpos - $firstpos==1){ - @{$CVRange}[$i] = "~:"; - } - else{ - @{$CVRange}[$i] =substr $Nagios->opts->critical, $firstpos, ($secondpos-$firstpos-1); - } - $firstpos=$secondpos; - $i++ - } - if (length($Nagios->opts->critical) - $firstpos==0){#La coma es el ultimo elemento del string - @{$CVRange}[$i] = "~:"; - } - else{ - @{$CVRange}[$i] = substr $Nagios->opts->critical, $firstpos, (length($Nagios->opts->critical)-$firstpos); - } - - if (@{$CVRange}[0] !~/^(@?(\d+|(\d+|~):(\d+)?))?$/) { - ${$Error} = "Invalid Process Critical threshold in @{$CVRange}[0]"; - return 0; - } - if (@{$CVRange}[1] !~/^(@?(\d+|(\d+|~):(\d+)?))?$/) { - ${$Error} = "Invalid Application Critical threshold in @{$CVRange}[1]"; - return 0; - } - } - - return 1; -} - - -# Performs whole check: -# Input: Nagios Plugin object, reference to Plugin output string, Application, referece to WVRange, reference to CVRange -# Output: Plugin output string -# Return value: Plugin return value - -sub PerformCheck() { - my ($Nagios, $PluginOutput, $WVRange, $CVRange) = @_; - my $Application; - my @AppNameSplitted; - my $ApplicationName; - my $PsCommand; - my $PsResult; - my @PsResultLines; - my $ProcLine; - my $ProcPid; - my $LsofCommand; - my $LsofResult; - my $ProcCount = 0; - my $FDCount = 0; - my $ProcFDAvg = 0; - my $PerProcMaxFD = 0; - my $ProcOKFlag = 0; - my $ProcWarningFlag = 0; - my $ProcCriticalFlag = 0; - my $OKFlag = 0; - my $WarningFlag = 0; - my $CriticalFlag = 0; - my $LastWarningProcFDs = 0; - my $LastWarningProc = -1; - my $LastCriticalProcFDs = 0; - my $LastCriticalProc = -1; - my $ProcPluginReturnValue = UNKNOWN; - my $AppPluginReturnValue = UNKNOWN; - my $PluginReturnValue = UNKNOWN; - my $PerformanceData = ""; - my $PerfdataUnit = "FDs"; - - $Application = $Nagios->opts->application; - $PsCommand = "ps -eaf | grep $Application"; - $PsResult = `$PsCommand`; - @AppNameSplitted = split(/\//, $Application); - $ApplicationName = $AppNameSplitted[$#AppNameSplitted]; - @PsResultLines = split(/\n/, $PsResult); - if ( $#PsResultLines > 1 ) { - foreach my $Proc (split(/\n/, $PsResult)) { - if ($Proc !~ /check_unix_open_fds/ && $Proc !~ / grep /) { - $ProcCount += 1; - $ProcPid = (split(/\s+/, $Proc))[1]; - $LsofCommand = "lsof -p $ProcPid | wc -l"; - $LsofResult = `$LsofCommand`; - $LsofResult = ($LsofResult > 0 ) ? ($LsofResult - 1) : 0; - $FDCount += $LsofResult; - if ($LsofResult >= $PerProcMaxFD) { $PerProcMaxFD = $LsofResult; } - $ProcPluginReturnValue = $Nagios->check_threshold(check => $LsofResult,warning => @{$WVRange}[0],critical => @{$CVRange}[0]); - if ($ProcPluginReturnValue eq OK) { - $ProcOKFlag = 1; - } - elsif ($ProcPluginReturnValue eq WARNING) { - $ProcWarningFlag = 1; - if ($LsofResult >= $LastWarningProcFDs) { - $LastWarningProcFDs = $LsofResult; - $LastWarningProc = $ProcPid; - } - } - #if ($LsofResult >= $PCT) { - elsif ($ProcPluginReturnValue eq CRITICAL) { - $ProcCriticalFlag = 1; - if ($LsofResult >= $LastCriticalProcFDs) { - $LastCriticalProcFDs = $LsofResult; - $LastCriticalProc = $ProcPid; - } - } - } - } - if ($ProcCount) { $ProcFDAvg = int($FDCount / $ProcCount); } - $AppPluginReturnValue = $Nagios->check_threshold(check => $FDCount,warning => @{$WVRange}[1],critical => @{$CVRange}[1]); - #if ($FDCount >= $TWT) { - if ($AppPluginReturnValue eq OK) { $OKFlag = 1; } - elsif ($AppPluginReturnValue eq WARNING) { $WarningFlag = 1; } - elsif ($AppPluginReturnValue eq CRITICAL) { $CriticalFlag = 1; } - - # PluginReturnValue and PluginOutput - if ($CriticalFlag) { - $PluginReturnValue = CRITICAL; - ${$PluginOutput} .= "$ApplicationName handling $FDCount files (critical threshold set to @{$CVRange}[1])"; - } - elsif ($WarningFlag) { - $PluginReturnValue = WARNING; - ${$PluginOutput} .= "$ApplicationName handling $FDCount files (warning threshold set to @{$WVRange}[1])"; - } - elsif ($ProcCriticalFlag) { - $PluginReturnValue = CRITICAL; - ${$PluginOutput} .= "Process ID $LastCriticalProc handling $LastCriticalProcFDs files (critical threshold set to @{$CVRange}[0])"; - } - elsif ($ProcWarningFlag) { - $PluginReturnValue = WARNING; - ${$PluginOutput} .= "Process ID $LastWarningProc handling $LastWarningProcFDs files (warning threshold set to @{$WVRange}[0])"; - } - elsif ($OKFlag && $ProcOKFlag) { - $PluginReturnValue = OK; - ${$PluginOutput} .= "$ApplicationName handling $FDCount files"; - } - } - else { - ${$PluginOutput} .= "No existe la aplicacion $ApplicationName"; - } - - - $PerformanceData .= "ProcCount=$ProcCount$PerfdataUnit FDCount=$FDCount$PerfdataUnit ProcFDAvg=$ProcFDAvg$PerfdataUnit PerProcMaxFD=$PerProcMaxFD$PerfdataUnit"; - - # Output with performance data: - ${$PluginOutput} .= " | $PerformanceData"; - - return $PluginReturnValue; -} diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp index 1554fd3c..9fc771e0 100644 --- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp +++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp @@ -1,5 +1,4 @@ -# configure logwatch and nagios checks for couchdb (both bigcouch and plain -# couchdb installations) +# configure logwatch and nagios checks for couchdb class site_check_mk::agent::couchdb { concat::fragment { 'syslog_couchdb': @@ -14,21 +13,4 @@ class site_check_mk::agent::couchdb { mode => '0755', require => Package['check_mk-agent'] } - - # check open files for bigcouch proc - include site_check_mk::agent::package::perl_plugin - file { '/srv/leap/nagios/plugins/check_unix_open_fds.pl': - source => 'puppet:///modules/site_check_mk/agent/nagios_plugins/check_unix_open_fds.pl', - mode => '0755' - } - augeas { - 'Couchdb_open_files': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => [ - 'rm /files/etc/check_mk/mrpe.cfg/Couchdb_open_files', - 'set Couchdb_open_files \'/srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720\'' ], - require => File['/etc/check_mk/mrpe.cfg']; - } - } diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb/bigcouch.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb/bigcouch.pp deleted file mode 100644 index 82c3ac72..00000000 --- a/puppet/modules/site_check_mk/manifests/agent/couchdb/bigcouch.pp +++ /dev/null @@ -1,49 +0,0 @@ -# configure logwatch and nagios checks for bigcouch -class site_check_mk::agent::couchdb::bigcouch { - - # watch bigcouch logs - # currently disabled because bigcouch is too noisy - # see https://leap.se/code/issues/7375 for more details - # and site_config::remove_files for removing leftovers - #file { '/etc/check_mk/logwatch.d/bigcouch.cfg': - # source => 'puppet:///modules/site_check_mk/agent/logwatch/bigcouch.cfg', - #} - - # check syslog msg from: - # - empd - # - /usr/local/bin/couch-doc-update - concat::fragment { 'syslog_bigcouch': - source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/bigcouch.cfg', - target => '/etc/check_mk/logwatch.d/syslog.cfg', - order => '02'; - } - - # check bigcouch processes - augeas { - 'Bigcouch_epmd_procs': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => [ - 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs', - 'set Bigcouch_epmd_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/epmd\'' ], - require => File['/etc/check_mk/mrpe.cfg']; - 'Bigcouch_beam_procs': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => [ - 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs', - 'set Bigcouch_beam_procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/beam\'' ], - require => File['/etc/check_mk/mrpe.cfg']; - } - - augeas { - 'Bigcouch_open_files': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => [ - 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files', - 'set Bigcouch_open_files \'/srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 28672,28672 -c 30720,30720\'' ], - require => File['/etc/check_mk/mrpe.cfg']; - } - -} diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp deleted file mode 100644 index 3ec2267b..00000000 --- a/puppet/modules/site_check_mk/manifests/agent/couchdb/plain.pp +++ /dev/null @@ -1,23 +0,0 @@ -# configure logwatch and nagios checks for plain single couchdb master -class site_check_mk::agent::couchdb::plain { - - # remove bigcouch leftovers - augeas { - 'Bigcouch_epmd_procs': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs', - require => File['/etc/check_mk/mrpe.cfg']; - 'Bigcouch_beam_procs': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs', - require => File['/etc/check_mk/mrpe.cfg']; - 'Bigcouch_open_files': - incl => '/etc/check_mk/mrpe.cfg', - lens => 'Spacevars.lns', - changes => 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files', - require => File['/etc/check_mk/mrpe.cfg']; - } - -} diff --git a/puppet/modules/site_config/manifests/remove/bigcouch.pp b/puppet/modules/site_config/manifests/remove/bigcouch.pp index 3535c3c1..9fd3e7ee 100644 --- a/puppet/modules/site_config/manifests/remove/bigcouch.pp +++ b/puppet/modules/site_config/manifests/remove/bigcouch.pp @@ -10,6 +10,33 @@ class site_config::remove::bigcouch { ] } + tidy { + '/etc/logrotate/bigcouch':; + '/srv/leap/nagios/plugins/check_unix_open_fds.pl':; + } + + augeas { + 'Couchdb_open_files': + incl => '/etc/check_mk/mrpe.cfg', + lens => 'Spacevars.lns', + changes => [ + 'rm /files/etc/check_mk/mrpe.cfg/Couchdb_open_files', + 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_epmd_procs', + 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_beam_procs', + 'rm /files/etc/check_mk/mrpe.cfg/Bigcouch_open_files' ], + require => File['/etc/check_mk/mrpe.cfg']; + } + + # check syslog msg from: + # - empd + # - /usr/local/bin/couch-doc-update + concat::fragment { 'syslog_bigcouch': + ensure => absent, + source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/bigcouch.cfg', + target => '/etc/check_mk/logwatch.d/syslog.cfg', + order => '02'; + } + exec { 'remove_bigcouch_logwatch_stateline': command => "sed -i '/bigcouch.log/d' /etc/check_mk/logwatch.state", refreshonly => true, diff --git a/puppet/modules/site_couchdb/files/runit_config b/puppet/modules/site_couchdb/files/runit_config deleted file mode 100644 index 169b4832..00000000 --- a/puppet/modules/site_couchdb/files/runit_config +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -exec 2>&1 -export HOME=/home/bigcouch -ulimit -H -n 32768 -ulimit -S -n 32768 -exec chpst -u bigcouch /opt/bigcouch/bin/bigcouch diff --git a/puppet/modules/site_couchdb/manifests/bigcouch.pp b/puppet/modules/site_couchdb/manifests/bigcouch.pp deleted file mode 100644 index 2de3d4d0..00000000 --- a/puppet/modules/site_couchdb/manifests/bigcouch.pp +++ /dev/null @@ -1,50 +0,0 @@ -# sets up bigcouch on couchdb node -class site_couchdb::bigcouch { - - $config = $::site_couchdb::couchdb_config['bigcouch'] - $cookie = $config['cookie'] - $ednp_port = $config['ednp_port'] - - class { 'couchdb': - admin_pw => $::site_couchdb::couchdb_admin_pw, - admin_salt => $::site_couchdb::couchdb_admin_salt, - bigcouch => true, - bigcouch_cookie => $cookie, - ednp_port => $ednp_port, - chttpd_bind_address => '127.0.0.1' - } - - # - # stunnel must running correctly before bigcouch dbs can be set up. - # - Class['site_config::default'] - -> Class['site_config::resolvconf'] - -> Class['couchdb::bigcouch::package::cloudant'] - -> Service['shorewall'] - -> Exec['refresh_stunnel'] - -> Class['site_couchdb::setup'] - -> Class['site_couchdb::bigcouch::add_nodes'] - -> Class['site_couchdb::bigcouch::settle_cluster'] - -> Class['site_couchdb::create_dbs'] - - include site_couchdb::bigcouch::add_nodes - include site_couchdb::bigcouch::settle_cluster - include site_couchdb::bigcouch::compaction - - file { '/var/log/bigcouch': - ensure => directory - } - - file { '/etc/sv/bigcouch/run': - ensure => present, - source => 'puppet:///modules/site_couchdb/runit_config', - owner => root, - group => root, - mode => '0755', - require => Package['couchdb'], - notify => Service['couchdb'] - } - - include site_check_mk::agent::couchdb::bigcouch - -} diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp deleted file mode 100644 index c8c43275..00000000 --- a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp +++ /dev/null @@ -1,8 +0,0 @@ -class site_couchdb::bigcouch::add_nodes { - # loop through neighbors array and add nodes - $nodes = $::site_couchdb::bigcouch::config['neighbors'] - - couchdb::bigcouch::add_node { $nodes: - require => Couchdb::Query::Setup['localhost'] - } -} diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/compaction.pp b/puppet/modules/site_couchdb/manifests/bigcouch/compaction.pp deleted file mode 100644 index 84aab4ef..00000000 --- a/puppet/modules/site_couchdb/manifests/bigcouch/compaction.pp +++ /dev/null @@ -1,8 +0,0 @@ -class site_couchdb::bigcouch::compaction { - cron { - 'compact_all_shards': - command => '/srv/leap/couchdb/scripts/bigcouch_compact_all_shards.sh >> /var/log/bigcouch/compaction.log', - hour => 3, - minute => 17; - } -} diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/settle_cluster.pp b/puppet/modules/site_couchdb/manifests/bigcouch/settle_cluster.pp deleted file mode 100644 index 820b5be2..00000000 --- a/puppet/modules/site_couchdb/manifests/bigcouch/settle_cluster.pp +++ /dev/null @@ -1,11 +0,0 @@ -class site_couchdb::bigcouch::settle_cluster { - - exec { 'wait_for_couch_nodes': - command => '/srv/leap/bin/run_tests --test CouchDB/Are_configured_nodes_online? --retry 12 --wait 10' - } - - exec { 'settle_cluster_membership': - command => '/srv/leap/bin/run_tests --test CouchDB/Is_cluster_membership_ok? --retry 12 --wait 10', - require => Exec['wait_for_couch_nodes'] - } -} diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index c4fe6277..554bf813 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,4 +1,4 @@ -# entry class for configuring couchdb/bigcouch node +# entry class for configuring couchdb node # couchdb node class site_couchdb { tag 'leap_service' @@ -39,12 +39,6 @@ class site_couchdb { $couchdb_backup = $couchdb_config['backup'] $couchdb_mode = $couchdb_config['mode'] - # ensure bigcouch has been purged from the system: - # TODO: remove this check in 0.9 release - if file('/opt/bigcouch/bin/bigcouch', '/dev/null') != '' { - fail 'ERROR: BigCouch appears to be installed. Make sure you have migrated to CouchDB before proceeding. See https://leap.se/upgrade-0-8' - } - include site_couchdb::plain Class['site_config::default'] @@ -60,7 +54,6 @@ class site_couchdb { include site_couchdb::create_dbs include site_couchdb::add_users include site_couchdb::designs - include site_couchdb::logrotate if $couchdb_backup { include site_couchdb::backup } diff --git a/puppet/modules/site_couchdb/manifests/logrotate.pp b/puppet/modules/site_couchdb/manifests/logrotate.pp deleted file mode 100644 index bb8843bb..00000000 --- a/puppet/modules/site_couchdb/manifests/logrotate.pp +++ /dev/null @@ -1,14 +0,0 @@ -# configure couchdb logrotation -class site_couchdb::logrotate { - - augeas { - 'logrotate_bigcouch': - context => '/files/etc/logrotate.d/bigcouch/rule', - changes => [ - 'set file /opt/bigcouch/var/log/*.log', 'set rotate 7', - 'set schedule daily', 'set compress compress', - 'set missingok missingok', 'set ifempty notifempty', - 'set copytruncate copytruncate' ] - } - -} diff --git a/puppet/modules/site_couchdb/manifests/plain.pp b/puppet/modules/site_couchdb/manifests/plain.pp index b40fc100..710ff7ca 100644 --- a/puppet/modules/site_couchdb/manifests/plain.pp +++ b/puppet/modules/site_couchdb/manifests/plain.pp @@ -6,8 +6,6 @@ class site_couchdb::plain { chttpd_bind_address => '127.0.0.1' } - include site_check_mk::agent::couchdb::plain - # remove bigcouch leftovers from previous installations include ::site_config::remove::bigcouch diff --git a/puppet/modules/site_couchdb/manifests/setup.pp b/puppet/modules/site_couchdb/manifests/setup.pp index 710d3c1c..7477d24c 100644 --- a/puppet/modules/site_couchdb/manifests/setup.pp +++ b/puppet/modules/site_couchdb/manifests/setup.pp @@ -3,13 +3,6 @@ # class site_couchdb::setup { - # ensure that we don't have leftovers from previous installations - # where we installed the cloudant bigcouch package - # https://leap.se/code/issues/4971 - class { 'couchdb::bigcouch::package::cloudant': - ensure => absent - } - $user = $site_couchdb::couchdb_admin_user # setup /etc/couchdb/couchdb-admin.netrc for couchdb admin access diff --git a/tests/white-box/couchdb.rb b/tests/white-box/couchdb.rb index 85dc6840..44a2769b 100644 --- a/tests/white-box/couchdb.rb +++ b/tests/white-box/couchdb.rb @@ -27,23 +27,6 @@ class CouchDB < LeapTest end # - # compare the configured nodes to the nodes that are actually listed in bigcouch - # - def test_02_Is_cluster_membership_ok? - return unless multimaster? - url = couchdb_backend_url("/nodes/_all_docs") - neighbors = assert_property('couch.bigcouch.neighbors') - neighbors << assert_property('domain.full') - neighbors.sort! - assert_get(url) do |body| - response = JSON.parse(body) - nodes_in_db = response['rows'].collect{|row| row['id'].sub(/^bigcouch@/, '')}.sort - assert_equal neighbors, nodes_in_db, "The couchdb replication node list is wrong (/nodes/_all_docs)" - end - pass - end - - # # all configured nodes are in 'cluster_nodes' # all nodes online and communicating are in 'all_nodes' # |