From e24547bda76a4e143684790234f78311e1fea1b1 Mon Sep 17 00:00:00 2001
From: UrBnW <40244829+UrBnW@users.noreply.github.com>
Date: Sat, 28 Mar 2020 14:43:00 +0100
Subject: [PATCH 1/2] MikroTik, add proper disk mode

---
 network/mikrotik/snmp/mode/disk.pm   | 104 +++++++++++++++++++++++++++
 network/mikrotik/snmp/mode/memory.pm |   4 +-
 network/mikrotik/snmp/plugin.pm      |   1 +
 3 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 network/mikrotik/snmp/mode/disk.pm

diff --git a/network/mikrotik/snmp/mode/disk.pm b/network/mikrotik/snmp/mode/disk.pm
new file mode 100644
index 000000000..edbd7e6a0
--- /dev/null
+++ b/network/mikrotik/snmp/mode/disk.pm
@@ -0,0 +1,104 @@
+#
+# Copyright 2020 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package network::mikrotik::snmp::mode::disk;
+
+use base qw(snmp_standard::mode::storage);
+
+use strict;
+use warnings;
+
+sub default_storage_type {
+    my ($self, %options) = @_;
+    
+    return '^(?!(hrStorageRam)$)';
+}
+
+sub prefix_storage_output {
+    my ($self, %options) = @_;
+    
+    return "Disk '" . $options{instance_value}->{display} . "' ";
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check memory.
+
+=over 8
+
+=item B<--warning-usage>
+
+Threshold warning.
+
+=item B<--critical-usage>
+
+Threshold critical.
+
+=item B<--units>
+
+Units of thresholds (Default: '%') ('%', 'B').
+
+=item B<--free>
+
+Thresholds are on free space left.
+
+=item B<--storage>
+
+Set the storage (number expected) ex: 1, 2,... (empty means 'check all storage').
+
+=item B<--name>
+
+Allows to use storage name with option --storage instead of storage oid index.
+
+=item B<--regexp>
+
+Allows to use regexp to filter storage (with option --name).
+
+=item B<--regexp-isensitive>
+
+Allows to use regexp non case-sensitive (with --regexp).
+
+=item B<--reload-cache-time>
+
+Time in minutes before reloading cache file (default: 180).
+
+=item B<--show-cache>
+
+Display cache storage datas.
+
+=item B<--filter-storage-type>
+
+Filter storage types with a regexp (Default: '^(?!(hrStorageRam)$)').
+
+=back
+
+=cut
diff --git a/network/mikrotik/snmp/mode/memory.pm b/network/mikrotik/snmp/mode/memory.pm
index dc451ef33..fccdc8808 100644
--- a/network/mikrotik/snmp/mode/memory.pm
+++ b/network/mikrotik/snmp/mode/memory.pm
@@ -28,7 +28,7 @@ use warnings;
 sub default_storage_type {
     my ($self, %options) = @_;
     
-    return '^(hrStorageRam|hrStorageFlashMemory)';
+    return '^hrStorageRam$';
 }
 
 sub prefix_storage_output {
@@ -97,7 +97,7 @@ Display cache storage datas.
 
 =item B<--filter-storage-type>
 
-Filter storage types with a regexp (Default: '^(hrStorageRam|hrStorageFlashMemory)$').
+Filter storage types with a regexp (Default: '^hrStorageRam$').
 
 =back
 
diff --git a/network/mikrotik/snmp/plugin.pm b/network/mikrotik/snmp/plugin.pm
index b45557fa1..d79b3eb55 100644
--- a/network/mikrotik/snmp/plugin.pm
+++ b/network/mikrotik/snmp/plugin.pm
@@ -32,6 +32,7 @@ sub new {
     $self->{version} = '1.0';
     %{$self->{modes}} = (
         'cpu'               => 'snmp_standard::mode::cpu',
+        'disk'              => 'network::mikrotik::snmp::mode::disk',
         'environment'       => 'network::mikrotik::snmp::mode::environment',
         'interfaces'        => 'network::mikrotik::snmp::mode::interfaces',
         'list-interfaces'   => 'snmp_standard::mode::listinterfaces',

From 9084a193e9ee86d027613a1a71a7f6a94e9c5f6f Mon Sep 17 00:00:00 2001
From: UrBnW <40244829+UrBnW@users.noreply.github.com>
Date: Sat, 28 Mar 2020 14:50:33 +0100
Subject: [PATCH 2/2] Typo

---
 network/mikrotik/snmp/mode/disk.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network/mikrotik/snmp/mode/disk.pm b/network/mikrotik/snmp/mode/disk.pm
index edbd7e6a0..da39790de 100644
--- a/network/mikrotik/snmp/mode/disk.pm
+++ b/network/mikrotik/snmp/mode/disk.pm
@@ -51,7 +51,7 @@ __END__
 
 =head1 MODE
 
-Check memory.
+Check disk.
 
 =over 8