[Debian-rtc-admin] patches to monitor prosody using munin and enable a module

Julien Cristau jcristau at debian.org
Fri Nov 29 14:35:46 GMT 2019


Hi Gustavo,

On Mon, Nov 25, 2019 at 05:00:41PM +0000, gustavo panizzo wrote:
> commit 954c6b3e6a53fd324e13fd9c4d196802e0fa1812
> Author: gustavo panizzo <gfa at zumbi.com.ar>
> Date:   Thu Nov 14 22:49:02 2019 +0100
> 
>     enable the admin telnet module on prosody
> 
> diff --git a/modules/profile/manifests/prosody.pp b/modules/profile/manifests/prosody.pp
> index 841f74f18411..84149ef924e1 100644
> --- a/modules/profile/manifests/prosody.pp
> +++ b/modules/profile/manifests/prosody.pp
> @@ -29,7 +29,7 @@ class profile::prosody {
>      # and add the modules we want on top
>      modules           => [
>        'admin_adhoc', 'blocking',  'carbons', 'carbons_adhoc',
> -      'cloud_notify', 'csi', 'filter_chatstates', 'http',
> +      'cloud_notify', 'csi', 'filter_chatstates', 'http', 'admin_telnet',
>        'http_upload', 'mam', 'smacks',  'smaks', 'throttle_presence',
>      ],
>    }

I'd need to be convinced that this is a good idea.
https://prosody.im/doc/modules/mod_admin_telnet makes it sound like it
really isn't.

> commit 81c98a241f3f73149894730e0ec24d589aba0c18 (HEAD -> gfa/prosody, origin/gfa/prosody)
> Author: gustavo panizzo <gfa at zumbi.com.ar>
> Date:   Tue Nov 19 22:02:04 2019 +0100
> 
>     monitor prosody with munin
> 
[...]
> diff --git a/modules/profile/manifests/prosody/munin.pp b/modules/profile/manifests/prosody/munin.pp
> new file mode 100644
> index 000000000000..a595b14bccfe
> --- /dev/null
> +++ b/modules/profile/manifests/prosody/munin.pp
> @@ -0,0 +1,25 @@
> +# this class manages munin for prosody
> +
> +class profile::prosody::munin {
> +
> +  file { '/usr/share/munin/plugins/prosody_':

/usr/share is for packaged stuff; this shouldn't go there.

> +    ensure => file,
> +    mode   => '0755',
> +    owner  => 'root',
> +    group  => 'root',
> +    source => "puppet:///modules/${module_name}/prosody/prosody_munin_plugin",
> +  }
> +
> +  munin::conf { 'prosody':
> +    source => "puppet:///modules/${module_name}/prosody/prosody_munin_conf",
> +  }
> +
> +  $prosody_plugins = [ 'prosody_c2s', 'prosody_s2s', 'prosody_uptime', 'prosody_users' ]
> +
> +  $prosody_plugins.each |$index, $plugin| {
> +    munin::check { $plugin:
> +      script => 'prosody_',
> +    }
> +  }
> +
> +}

Cheers,
Julien



More information about the Debian-rtc-team mailing list