update to librenms-22.8.0

- switch PHP dependency to 8.1, in advance of upstream change to require it.

- bring back patches to paths invoking the php binary to use ${MODPHP_BIN}
as /usr/local/bin/php won't point to 8.1 yet (and might not exist at all
unless 8.0 is also installed).

- another patch because we don't have whereis -b

net/librenms/Makefile

@@ -3,7 +3,7 @@ COMMENT=	auto-discovering network management/monitoring system
 # changelogs at https://github.com/librenms/librenms/releases
 GH_ACCOUNT=	librenms
 GH_PROJECT=	librenms
-GH_TAGNAME=	22.7.0
+GH_TAGNAME=	22.8.0
 
 DISTFILES=	${GH_DISTFILE} \
 		${PKGNAME}-vendor.tar.xz:0
@@ -23,6 +23,7 @@ MASTER_SITES0=	https://spacehopper.org/mirrors/
 MODULES=	lang/php \
 		lang/python
 MODPY_BUILDDEP= No
+MODPHP_VERSION=	8.1
 
 RUN_DEPENDS=	lang/php/${MODPHP_VERSION},-curl \
 		lang/php/${MODPHP_VERSION},-gd \
@@ -50,6 +51,7 @@ SUBST_VARS=	INSTDIR
 UPDATE_PLIST_ARGS += -i MODPHP_VERSION
 
 R =	s,^\#!( )?(/usr/bin/env |/bin/)bash,\#!${LOCALBASE}/bin/bash,;
+R +=	s,^\#!( )?/usr/bin/(env )?php.*,\#!${MODPHP_BIN},;
 R +=	s,^\#!( )?/usr/bin/(env )?python.*,\#!${MODPY_BIN},;
 R +=	s,/opt/librenms,/var/www/librenms,g;
 R +=	s,/var/www/librenms,${TRUEPREFIX}/librenms,g;
@@ -66,9 +68,17 @@ post-extract:
 	find ${WRKSRC} -type f -exec perl -pi -e '$R' {} +
 	sed -i \
 	    -e 's, librenms *, _librenms ,' \
+	    -e 's, php *, ${MODPHP_BIN} ,' \
 	    -e 's,/var/www/librenms/cronic,-n,' \
 	    ${WRKSRC}/librenms.nonroot.cron
 
+pre-configure:
+	cd ${WRKSRC}; ${SUBST_CMD} daily.sh \
+	    LibreNMS/__init__.py \
+	    LibreNMS/wrapper.py \
+	    LibreNMS/Validations/Php.php \
+	    LibreNMS/Exceptions/UnserializableRouteCache.php
+
 do-install:
 	${INSTALL_DATA_DIR} ${INSTDIR} \
 	    ${WRKINST}/${LOCALBASE}/share/bash-completion/completions/

net/librenms/distinfo

@@ -1,4 +1,4 @@
-SHA256 (librenms-22.7.0-vendor.tar.xz) = Zk5PY9MHD3nF1XwOHT0TzWBNEv1Axd3gY+Z6ZGof09w=
-SHA256 (librenms-22.7.0.tar.gz) = YaEFwxdNp+cj8ngJzyZIdernRJcHEg54pnCPNTdqcHU=
-SIZE (librenms-22.7.0-vendor.tar.xz) = 21506608
-SIZE (librenms-22.7.0.tar.gz) = 55184738
+SHA256 (librenms-22.8.0-vendor.tar.xz) = umJe0a0pR20MEnPxrrzTSF3lU6pHPyuwMSAHy62Upmg=
+SHA256 (librenms-22.8.0.tar.gz) = hJmMPHn4OmhIWAvat3us4BUiL0FSi5ZExjQknP8E7gE=
+SIZE (librenms-22.8.0-vendor.tar.xz) = 21498964
+SIZE (librenms-22.8.0.tar.gz) = 55649658

net/librenms/patches/patch-LibreNMS_Config_php

@@ -1,21 +1,14 @@
-openbsd (and netbsd) whereis don't support -b, neither do they prefix the
-output with the name of the searched command.
+OpenBSD (and NetBSD) whereis don't support -b
 
 Index: LibreNMS/Config.php
 --- LibreNMS/Config.php.orig
 +++ LibreNMS/Config.php
-@@ -521,8 +521,12 @@ class Config
+@@ -521,7 +521,7 @@ class Config
      public static function locateBinary($binary)
      {
          if (! Str::contains($binary, '/')) {
 -            $output = `whereis -b $binary`;
--            $list = trim(substr($output, strpos($output, ':') + 1));
 +            $output = `whereis $binary`;
-+            if (strpos($output, ':')) {
-+                $list = trim(substr($output, strpos($output, ':') + 1));
-+            } else {
-+                $list = trim($output);
-+            }
+             $list = trim(substr($output, strpos($output, ':') + 1));
              $targets = explode(' ', $list);
              foreach ($targets as $target) {
-                 if (is_executable($target)) {

net/librenms/patches/patch-LibreNMS_Exceptions_UnserializableRouteCache_php

@@ -0,0 +1,12 @@
+Index: LibreNMS/Exceptions/UnserializableRouteCache.php
+--- LibreNMS/Exceptions/UnserializableRouteCache.php.orig
++++ LibreNMS/Exceptions/UnserializableRouteCache.php
+@@ -50,7 +50,7 @@ class UnserializableRouteCache extends \Exception impl
+     {
+         $errorMessage = "Erroneous data format for unserializing 'Symfony\Component\Routing\CompiledRoute'";
+         if ($exception instanceof \ErrorException && $exception->message == $errorMessage) {
+-            $cli = rtrim(shell_exec('php -r "echo PHP_VERSION;"'));
++            $cli = rtrim(shell_exec('${MODPHP_BIN} -r "echo PHP_VERSION;"'));
+             if (version_compare($cli, PHP_VERSION, '!=')) {
+                 return new static($exception->getMessage(), $exception->getCode(), $exception, $cli, PHP_VERSION);
+             }

net/librenms/patches/patch-LibreNMS_Validations_Php_php

@@ -0,0 +1,39 @@
+Index: LibreNMS/Validations/Php.php
+--- LibreNMS/Validations/Php.php.orig
++++ LibreNMS/Validations/Php.php
+@@ -56,7 +56,7 @@ class Php extends BaseValidation
+         }
+ 
+         $web_version = PHP_VERSION;
+-        $cli_version = rtrim(shell_exec('php -r "echo PHP_VERSION;"'));
++        $cli_version = rtrim(shell_exec('${MODPHP_BIN} -r "echo PHP_VERSION;"'));
+         if (version_compare($web_version, $cli_version, '!=')) {
+             $validator->fail("PHP version of your webserver ($web_version) does not match the cli version ($cli_version)", 'If you updated PHP recently, restart php-fpm or apache to switch to the new version');
+         }
+@@ -73,7 +73,7 @@ class Php extends BaseValidation
+         foreach ($required_modules as $extension) {
+             if (! extension_loaded($extension)) {
+                 $validator->fail("Missing PHP extension: $extension", "Please install $extension");
+-            } elseif (shell_exec("php -r \"var_export(extension_loaded('$extension'));\"") == 'false') {
++            } elseif (shell_exec("${MODPHP_BIN} -r \"var_export(extension_loaded('$extension'));\"") == 'false') {
+                 $validator->fail("Missing CLI PHP extension: $extension", "Please install $extension");
+             }
+         }
+@@ -120,7 +120,7 @@ class Php extends BaseValidation
+         $ini_tz = ini_get('date.timezone');
+         $sh_tz = rtrim(shell_exec('date +%Z'));
+         $php_tz = date('T');
+-        $php_cli_tz = rtrim(shell_exec('php -r "echo date(\'T\');"'));
++        $php_cli_tz = rtrim(shell_exec('${MODPHP_BIN} -r "echo date(\'T\');"'));
+ 
+         if (empty($ini_tz)) {
+             // make sure timezone is set
+@@ -139,7 +139,7 @@ class Php extends BaseValidation
+             // check if web and cli timezones match (this does nothing if validate.php is run on cli)
+             // some distros have different php.ini for cli and the web server
+             if ($sh_tz !== $php_cli_tz) {
+-                $ini_file = rtrim(shell_exec('php -r "echo php_ini_loaded_file();"'));
++                $ini_file = rtrim(shell_exec('${MODPHP_BIN} -r "echo php_ini_loaded_file();"'));
+                 $validator->fail(
+                     "The CLI php.ini ($php_cli_tz) timezone is different than your system's timezone ($sh_tz)",
+                     "Edit your CLI ini file $ini_file and set the correct timezone ($sh_tz)."

net/librenms/patches/patch-LibreNMS_Validations_System_php

@@ -0,0 +1,14 @@
+OpenBSD (and NetBSD) whereis don't support -b
+
+Index: LibreNMS/Validations/System.php
+--- LibreNMS/Validations/System.php.orig
++++ LibreNMS/Validations/System.php
+@@ -40,7 +40,7 @@ class System extends BaseValidation
+     {
+         $install_dir = $validator->getBaseDir();
+ 
+-        $lnms = str_replace('lnms:', '', rtrim(`whereis -b lnms 2>/dev/null`));
++        $lnms = str_replace('lnms:', '', rtrim(`whereis lnms 2>/dev/null`));
+         $path = rtrim(`echo "\$PATH"`);
+ 
+         // if couldn't find lnms and we have PATH

net/librenms/patches/patch-LibreNMS___init___py

@@ -0,0 +1,21 @@
+Index: LibreNMS/__init__.py
+--- LibreNMS/__init__.py.orig
++++ LibreNMS/__init__.py
+@@ -167,7 +167,7 @@ def get_config_data(base_dir):
+         )
+         logger.debug("Traceback:", exc_info=True)
+ 
+-    config_cmd = ["/usr/bin/env", "php", "%s/config_to_json.php" % base_dir]
++    config_cmd = ["${MODPHP_BIN}", "%s/config_to_json.php" % base_dir]
+     try:
+         exit_code, output = command_runner(config_cmd, timeout=300, stderr=False)
+         if exit_code != 0:
+@@ -194,7 +194,7 @@ def call_script(script, args=()):
+     """
+     if script.endswith(".php"):
+         # save calling the sh process
+-        base = ("/usr/bin/env", "php")
++        base = ("${MODPHP_BIN}")
+     else:
+         base = ()
+ 

net/librenms/patches/patch-LibreNMS_wrapper_py

@@ -0,0 +1,12 @@
+Index: LibreNMS/wrapper.py
+--- LibreNMS/wrapper.py.orig
++++ LibreNMS/wrapper.py
+@@ -278,7 +278,7 @@ def poll_worker(
+                     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
+                     wrappers[wrapper_type]["executable"],
+                 )
+-                command = "/usr/bin/env php {} -h {}".format(executable, device_id)
++                command = "${MODPHP_BIN} {} -h {}".format(executable, device_id)
+                 if debug:
+                     command = command + " -d"
+                 exit_code, output = command_runner(

net/librenms/patches/patch-daily_sh

@@ -1,7 +1,13 @@
 Index: daily.sh
 --- daily.sh.orig
 +++ daily.sh
-@@ -32,7 +32,7 @@ LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php
+@@ -27,12 +27,12 @@ COMPOSER="php ${LIBRENMS_DIR}/scripts/composer_wrapper
+ 
+ # set log_file, using librenms 'log_dir' config setting, if set
+ # otherwise we default to <LibreNMS Install Directory>/logs
+-LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';")
++LOG_DIR=$(${MODPHP_BIN} -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';")
+ 
  # get the librenms user
  # shellcheck source=.env.example
  source "${LIBRENMS_DIR}/.env"
@@ -10,7 +16,7 @@ Index: daily.sh
  LIBRENMS_USER_ID=$(id -u "$LIBRENMS_USER")
  
  #######################################
-@@ -132,7 +132,7 @@ set_notifiable_result() {
+@@ -132,13 +132,13 @@ set_notifiable_result() {
  check_dependencies() {
      local branch ver_56 ver_71 ver_72 ver_73 python3 python_deps phpver pythonver old_branches msg
  
@@ -18,4 +24,14 @@ Index: daily.sh
 +    branch=master
      scripts/check_requirements.py > /dev/null 2>&1 || pip3 install -r requirements.txt > /dev/null 2>&1
  
-     ver_56=$(php -r "echo (int)version_compare(PHP_VERSION, '5.6.4', '<');")
+-    ver_56=$(php -r "echo (int)version_compare(PHP_VERSION, '5.6.4', '<');")
+-    ver_71=$(php -r "echo (int)version_compare(PHP_VERSION, '7.1.3', '<');")
+-    ver_72=$(php -r "echo (int)version_compare(PHP_VERSION, '7.2.5', '<');")
+-    ver_73=$(php -r "echo (int)version_compare(PHP_VERSION, '7.3', '<');")
++    ver_56=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '5.6.4', '<');")
++    ver_71=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '7.1.3', '<');")
++    ver_72=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '7.2.5', '<');")
++    ver_73=$(${MODPHP_BIN} -r "echo (int)version_compare(PHP_VERSION, '7.3', '<');")
+     python3=$(python3 -c "import sys;print(int(sys.version_info < (3, 4)))" 2> /dev/null)
+     python_deps=$("${LIBRENMS_DIR}/scripts/check_requirements.py" > /dev/null 2>&1; echo $?)
+     phpver="master"

net/librenms/pkg/PLIST

@@ -322,6 +322,7 @@ librenms/LibreNMS/OS/AviatWtm.php
 librenms/LibreNMS/OS/Avocent.php
 librenms/LibreNMS/OS/Awplus.php
 librenms/LibreNMS/OS/Barracudangfirewall.php
+librenms/LibreNMS/OS/Bats.php
 librenms/LibreNMS/OS/Beagleboard.php
 librenms/LibreNMS/OS/Boss.php
 librenms/LibreNMS/OS/Brother.php
@@ -680,6 +681,7 @@ librenms/LibreNMS/Util/Proxy.php
 librenms/LibreNMS/Util/Rewrite.php
 librenms/LibreNMS/Util/Smokeping.php
 librenms/LibreNMS/Util/Snmpsim.php
+librenms/LibreNMS/Util/Stats.php
 librenms/LibreNMS/Util/StringHelpers.php
 librenms/LibreNMS/Util/Time.php
 librenms/LibreNMS/Util/Url.php
@@ -700,9 +702,20 @@ librenms/LibreNMS/Validations/Database/CheckSchemaStructure.php
 librenms/LibreNMS/Validations/Database/CheckSqlServerTime.php
 librenms/LibreNMS/Validations/Dependencies.php
 librenms/LibreNMS/Validations/Disk.php
+librenms/LibreNMS/Validations/DistributedPoller/
 librenms/LibreNMS/Validations/DistributedPoller.php
+librenms/LibreNMS/Validations/DistributedPoller/CheckDistributedPollerEnabled.php
+librenms/LibreNMS/Validations/DistributedPoller/CheckMemcached.php
+librenms/LibreNMS/Validations/DistributedPoller/CheckRrdcached.php
 librenms/LibreNMS/Validations/Mail.php
 librenms/LibreNMS/Validations/Php.php
+librenms/LibreNMS/Validations/Poller/
+librenms/LibreNMS/Validations/Poller.php
+librenms/LibreNMS/Validations/Poller/CheckActivePoller.php
+librenms/LibreNMS/Validations/Poller/CheckDispatcherService.php
+librenms/LibreNMS/Validations/Poller/CheckLocking.php
+librenms/LibreNMS/Validations/Poller/CheckPythonWrapper.php
+librenms/LibreNMS/Validations/Poller/CheckRedis.php
 librenms/LibreNMS/Validations/Programs.php
 librenms/LibreNMS/Validations/Python.php
 librenms/LibreNMS/Validations/Rrd/
@@ -719,6 +732,7 @@ librenms/LibreNMS/Validator.php
 librenms/LibreNMS/Waas.php
 librenms/LibreNMS/__init__.py
 librenms/LibreNMS/command_runner.py
+librenms/LibreNMS/config.py
 librenms/LibreNMS/queuemanager.py
 librenms/LibreNMS/service.py
 librenms/LibreNMS/wrapper.py
@@ -764,6 +778,8 @@ librenms/app/Console/Commands/GetConfigCommand.php
 librenms/app/Console/Commands/InternalHttpRequest.php
 librenms/app/Console/Commands/KeyRotate.php
 librenms/app/Console/Commands/PluginAddCommand.php
+librenms/app/Console/Commands/PluginDisable.php
+librenms/app/Console/Commands/PluginEnable.php
 librenms/app/Console/Commands/PluginRemoveCommand.php
 librenms/app/Console/Commands/SchemaDumpCommand.php
 librenms/app/Console/Commands/SetConfigCommand.php
@@ -771,6 +787,7 @@ librenms/app/Console/Commands/SmokepingGenerateCommand.php
 librenms/app/Console/Commands/SnmpFetch.php
 librenms/app/Console/Commands/Traits/
 librenms/app/Console/Commands/Traits/CompletesConfigArgument.php
+librenms/app/Console/Commands/Traits/CompletesPluginArgument.php
 librenms/app/Console/Commands/TranslationGenerateCommand.php
 librenms/app/Console/Kernel.php
 librenms/app/Console/LnmsCommand.php
@@ -1476,6 +1493,7 @@ librenms/database/migrations/2022_05_25_084617_migrate_widget_ids.php
 librenms/database/migrations/2022_05_25_085715_remove_user_widgets_id.php
 librenms/database/migrations/2022_05_25_090027_drop_widgets_table.php
 librenms/database/migrations/2022_05_30_084932_update-app-status-length.php
+librenms/database/migrations/2022_07_03_1947_add_app_data.php
 librenms/database/migrations/2022_07_19_081224_plugins_unique_index.php
 librenms/database/schema/
 librenms/database/schema/mysql-schema.dump
@@ -1526,6 +1544,7 @@ librenms/doc/Alerting/img/unack.png
 librenms/doc/Alerting/index.md
 librenms/doc/CNAME
 librenms/doc/Developing/
+librenms/doc/Developing/Application-Notes.md
 librenms/doc/Developing/Code-Structure.md
 librenms/doc/Developing/Creating-Documentation.md
 librenms/doc/Developing/Creating-Release.md
@@ -1694,7 +1713,6 @@ librenms/doc/img/webui_add_device.png
 librenms/doc/img/world-map-widget-settings.png
 librenms/doc/index.md
 librenms/doc/js/
-librenms/doc/js/docs-install-tab.js
 librenms/doc/js/docs-settings-links.js
 librenms/doc/librenms.css
 librenms/doc/robots.txt
@@ -1812,6 +1830,7 @@ librenms/html/images/librenms_logo_vertical_light.svg
 librenms/html/images/librenms_logo_vertical_mono.svg
 librenms/html/images/logos/
 librenms/html/images/logos/algcom.png
+librenms/html/images/logos/almalinux.svg
 librenms/html/images/logos/alpha.png
 librenms/html/images/logos/alpineoe.png
 librenms/html/images/logos/alvarion.png
@@ -1821,6 +1840,7 @@ librenms/html/images/logos/atal.png
 librenms/html/images/logos/ats.png
 librenms/html/images/logos/avtech.svg
 librenms/html/images/logos/axis.svg
+librenms/html/images/logos/bats.png
 librenms/html/images/logos/bcn.png
 librenms/html/images/logos/ccpower.png
 librenms/html/images/logos/chatsworth.png
@@ -1898,9 +1918,10 @@ librenms/html/images/logos/quantastor.svg
 librenms/html/images/logos/raritan.svg
 librenms/html/images/logos/ribbon.svg
 librenms/html/images/logos/riedo.png
+librenms/html/images/logos/riello.png
 librenms/html/images/logos/rittal.svg
 librenms/html/images/logos/rockstor.svg
-librenms/html/images/logos/rockylinux.svg
+librenms/html/images/logos/rocky.svg
 librenms/html/images/logos/rs.svg
 librenms/html/images/logos/ruckus.svg
 librenms/html/images/logos/ruijie.png
@@ -1911,6 +1932,7 @@ librenms/html/images/logos/siae.png
 librenms/html/images/logos/siemens.svg
 librenms/html/images/logos/sixnet.png
 librenms/html/images/logos/smartoptics.svg
+librenms/html/images/logos/solidoptics.png
 librenms/html/images/logos/sophos.png
 librenms/html/images/logos/supermicro.svg
 librenms/html/images/logos/tandberg.svg
@@ -1958,6 +1980,7 @@ librenms/html/images/os/alcoma-almp.png
 librenms/html/images/os/algcom.png
 librenms/html/images/os/alliedtelesis.svg
 librenms/html/images/os/allworx.svg
+librenms/html/images/os/almalinux.svg
 librenms/html/images/os/alpha.png
 librenms/html/images/os/alpine.png
 librenms/html/images/os/alpineoe.png
@@ -1985,6 +2008,7 @@ librenms/html/images/os/avtech.svg
 librenms/html/images/os/axis.svg
 librenms/html/images/os/barco.svg
 librenms/html/images/os/barracuda.svg
+librenms/html/images/os/bats.png
 librenms/html/images/os/bcn.png
 librenms/html/images/os/bdcom.svg
 librenms/html/images/os/beagleboard.png
@@ -2157,7 +2181,7 @@ librenms/html/images/os/marathonups.png
 librenms/html/images/os/mcafee.png
 librenms/html/images/os/mcafeewebgateway.svg
 librenms/html/images/os/meinberg.svg
-librenms/html/images/os/mellanox.png
+librenms/html/images/os/mellanox.svg
 librenms/html/images/os/meraki.png
 librenms/html/images/os/mge.png
 librenms/html/images/os/microsemi.png
@@ -2178,7 +2202,6 @@ librenms/html/images/os/netapp.svg
 librenms/html/images/os/netbotz.png
 librenms/html/images/os/netbsd.svg
 librenms/html/images/os/netgear.svg
-librenms/html/images/os/netmanplus.png
 librenms/html/images/os/netmodule.png
 librenms/html/images/os/netonix.svg
 librenms/html/images/os/netopia.png
@@ -2252,7 +2275,7 @@ librenms/html/images/os/riello.png
 librenms/html/images/os/rittal.svg
 librenms/html/images/os/riverbed.png
 librenms/html/images/os/rockstor.svg
-librenms/html/images/os/rocky.png
+librenms/html/images/os/rocky.svg
 librenms/html/images/os/roku.svg
 librenms/html/images/os/rs.svg
 librenms/html/images/os/ruckus.svg
@@ -2280,6 +2303,7 @@ librenms/html/images/os/smartoptics.png
 librenms/html/images/os/snr.png
 librenms/html/images/os/socomecpdu.png
 librenms/html/images/os/solaris.svg
+librenms/html/images/os/solidoptics.png
 librenms/html/images/os/sonicwall.svg
 librenms/html/images/os/sonus.png
 librenms/html/images/os/sophos-xg.png
@@ -2497,7 +2521,6 @@ librenms/includes/caches/notifications.inc.php
 librenms/includes/caches/ports.inc.php
 librenms/includes/caches/services.inc.php
 librenms/includes/caches/toner.inc.php
-librenms/includes/callback.php
 librenms/includes/common.php
 librenms/includes/datastore.inc.php
 librenms/includes/dbFacile.php
@@ -2581,6 +2604,7 @@ librenms/includes/definitions/barracudaloadbalancer.yaml
 librenms/includes/definitions/barracudangfirewall.yaml
 librenms/includes/definitions/barracudaspamfirewall.yaml
 librenms/includes/definitions/barracudawafirewall.yaml
+librenms/includes/definitions/bats.yaml
 librenms/includes/definitions/bcm963.yaml
 librenms/includes/definitions/bdcom.yaml
 librenms/includes/definitions/beagleboard.yaml
@@ -2728,6 +2752,7 @@ librenms/includes/definitions/discovery/axisaudio.yaml
 librenms/includes/definitions/discovery/axiscam.yaml
 librenms/includes/definitions/discovery/barracudaspamfirewall.yaml
 librenms/includes/definitions/discovery/barracudawafirewall.yaml
+librenms/includes/definitions/discovery/bats.yaml
 librenms/includes/definitions/discovery/bdcom.yaml
 librenms/includes/definitions/discovery/benuos.yaml
 librenms/includes/definitions/discovery/binos.yaml
@@ -2815,6 +2840,7 @@ librenms/includes/definitions/discovery/eatonpdu.yaml
 librenms/includes/definitions/discovery/eatonups.yaml
 librenms/includes/definitions/discovery/eatonupsm2.yaml
 librenms/includes/definitions/discovery/edfa.yaml
+librenms/includes/definitions/discovery/edfamux.yaml
 librenms/includes/definitions/discovery/edgeos-ep.yaml
 librenms/includes/definitions/discovery/edgeos.yaml
 librenms/includes/definitions/discovery/edgeswitch.yaml
@@ -2984,6 +3010,7 @@ librenms/includes/definitions/discovery/mimosa.yaml
 librenms/includes/definitions/discovery/minkelsrms.yaml
 librenms/includes/definitions/discovery/monowall.yaml
 librenms/includes/definitions/discovery/motorola-cm.yaml
+librenms/includes/definitions/discovery/moxa-awk.yaml
 librenms/includes/definitions/discovery/moxa-etherdevice.yaml
 librenms/includes/definitions/discovery/moxa-nport.yaml
 librenms/includes/definitions/discovery/mrv-od.yaml
@@ -3217,6 +3244,7 @@ librenms/includes/definitions/eatonpdu.yaml
 librenms/includes/definitions/eatonups.yaml
 librenms/includes/definitions/eatonupsm2.yaml
 librenms/includes/definitions/edfa.yaml
+librenms/includes/definitions/edfamux.yaml
 librenms/includes/definitions/edgecos.yaml
 librenms/includes/definitions/edgeos-ep.yaml
 librenms/includes/definitions/edgeos.yaml
@@ -3416,6 +3444,7 @@ librenms/includes/definitions/mirth.yaml
 librenms/includes/definitions/mobileiron.yaml
 librenms/includes/definitions/monowall.yaml
 librenms/includes/definitions/motorola-cm.yaml
+librenms/includes/definitions/moxa-awk.yaml
 librenms/includes/definitions/moxa-etherdevice.yaml
 librenms/includes/definitions/moxa-nport.yaml
 librenms/includes/definitions/mrv-od.yaml
@@ -3535,7 +3564,6 @@ librenms/includes/definitions/ray3.yaml
 librenms/includes/definitions/recoveryos.yaml
 librenms/includes/definitions/remoteye4.yaml
 librenms/includes/definitions/ricoh.yaml
-librenms/includes/definitions/riello.yaml
 librenms/includes/definitions/rittal-cmc-iii-pu.yaml
 librenms/includes/definitions/rittal-cmc.yaml
 librenms/includes/definitions/rittal-lcp.yaml
@@ -4223,6 +4251,7 @@ librenms/includes/discovery/stp.inc.php
 librenms/includes/discovery/ucd-diskio.inc.php
 librenms/includes/discovery/vlans/
 librenms/includes/discovery/vlans.inc.php
+librenms/includes/discovery/vlans/aos6.inc.php
 librenms/includes/discovery/vlans/aos7.inc.php
 librenms/includes/discovery/vlans/boss.inc.php
 librenms/includes/discovery/vlans/cisco-vtp.inc.php
@@ -4526,6 +4555,90 @@ librenms/includes/html/graphs/application/nvidia_temp.inc.php
 librenms/includes/html/graphs/application/nvidia_tviol.inc.php
 librenms/includes/html/graphs/application/nvidia_txpci.inc.php
 librenms/includes/html/graphs/application/opengridscheduler_ogs.inc.php
+librenms/includes/html/graphs/application/opensearch_c_act_pri_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_c_act_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_c_act_shards_perc.inc.php
+librenms/includes/html/graphs/application/opensearch_c_all_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_c_data_nodes.inc.php
+librenms/includes/html/graphs/application/opensearch_c_delayed_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_c_in_fl_fetch.inc.php
+librenms/includes/html/graphs/application/opensearch_c_init_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_c_nodes.inc.php
+librenms/includes/html/graphs/application/opensearch_c_pending_tasks.inc.php
+librenms/includes/html/graphs/application/opensearch_c_rel_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_c_task_max_in_time.inc.php
+librenms/includes/html/graphs/application/opensearch_c_unass_shards.inc.php
+librenms/includes/html/graphs/application/opensearch_mem_all.inc.php
+librenms/includes/html/graphs/application/opensearch_status.inc.php
+librenms/includes/html/graphs/application/opensearch_tf_periodic.inc.php
+librenms/includes/html/graphs/application/opensearch_tf_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tf_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tfd_evictions.inc.php
+librenms/includes/html/graphs/application/opensearch_tfd_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tg_exists_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tg_exists_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tg_missing_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tg_missing_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tg_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tg_total.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_del_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_del_total.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_failed.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_noop_up_total.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_throttled.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_throttled_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ti_total.inc.php
+librenms/includes/html/graphs/application/opensearch_time_all.inc.php
+librenms/includes/html/graphs/application/opensearch_tm_docs.inc.php
+librenms/includes/html/graphs/application/opensearch_tm_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tm_throttled_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tm_throttled_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tm_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tm_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_cache_count.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_cache_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_evictions.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_hit.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_miss.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tqc_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tr_ext_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tr_ext_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tr_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tr_total.inc.php
+librenms/includes/html/graphs/application/opensearch_trc_evictions.inc.php
+librenms/includes/html/graphs/application/opensearch_trc_hits.inc.php
+librenms/includes/html/graphs/application/opensearch_trc_misses.inc.php
+librenms/includes/html/graphs/application/opensearch_trc_size.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_f_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_f_total.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_q_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_q_total.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_sc_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_sc_total.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_su_time.inc.php
+librenms/includes/html/graphs/application/opensearch_ts_su_total.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_count.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_docval_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_fbs_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_fields_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_indwrt_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_norms_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_points_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_terms_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_tvector_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tseg_vermap_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tst_res_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tst_size.inc.php
+librenms/includes/html/graphs/application/opensearch_ttl_last_mod_age.inc.php
+librenms/includes/html/graphs/application/opensearch_ttl_ops.inc.php
+librenms/includes/html/graphs/application/opensearch_ttl_size.inc.php
+librenms/includes/html/graphs/application/opensearch_ttl_uncom_ops.inc.php
+librenms/includes/html/graphs/application/opensearch_ttl_uncom_size.inc.php
+librenms/includes/html/graphs/application/opensearch_tw_time.inc.php
+librenms/includes/html/graphs/application/opensearch_tw_total.inc.php
 librenms/includes/html/graphs/application/opensips_load.inc.php
 librenms/includes/html/graphs/application/opensips_memory.inc.php
 librenms/includes/html/graphs/application/opensips_openfiles.inc.php
@@ -4599,6 +4712,22 @@ librenms/includes/html/graphs/application/rrdcached_events.inc.php
 librenms/includes/html/graphs/application/rrdcached_journal.inc.php
 librenms/includes/html/graphs/application/rrdcached_queue_length.inc.php
 librenms/includes/html/graphs/application/rrdcached_tree.inc.php
+librenms/includes/html/graphs/application/sagan_after.inc.php
+librenms/includes/html/graphs/application/sagan_alert.inc.php
+librenms/includes/html/graphs/application/sagan_bytes.inc.php
+librenms/includes/html/graphs/application/sagan_bytes_ignored.inc.php
+librenms/includes/html/graphs/application/sagan_drop.inc.php
+librenms/includes/html/graphs/application/sagan_drop_percent.inc.php
+librenms/includes/html/graphs/application/sagan_eps.inc.php
+librenms/includes/html/graphs/application/sagan_f_drop_percent.inc.php
+librenms/includes/html/graphs/application/sagan_f_dropped.inc.php
+librenms/includes/html/graphs/application/sagan_f_total.inc.php
+librenms/includes/html/graphs/application/sagan_ignore.inc.php
+librenms/includes/html/graphs/application/sagan_match.inc.php
+librenms/includes/html/graphs/application/sagan_max_bytes_log_line.inc.php
+librenms/includes/html/graphs/application/sagan_threshold.inc.php
+librenms/includes/html/graphs/application/sagan_total.inc.php
+librenms/includes/html/graphs/application/sagan_uptime.inc.php
 librenms/includes/html/graphs/application/sdfsinfo_blocks.inc.php
 librenms/includes/html/graphs/application/sdfsinfo_rates.inc.php
 librenms/includes/html/graphs/application/sdfsinfo_volume.inc.php
@@ -5334,6 +5463,7 @@ librenms/includes/html/pages/device/apps/ntp-server.inc.php
 librenms/includes/html/pages/device/apps/ntp.inc.php
 librenms/includes/html/pages/device/apps/nvidia.inc.php
 librenms/includes/html/pages/device/apps/opengridscheduler.inc.php
+librenms/includes/html/pages/device/apps/opensearch.inc.php
 librenms/includes/html/pages/device/apps/opensips.inc.php
 librenms/includes/html/pages/device/apps/os-updates.inc.php
 librenms/includes/html/pages/device/apps/php-fpm.inc.php
@@ -5350,6 +5480,7 @@ librenms/includes/html/pages/device/apps/puppet-agent.inc.php
 librenms/includes/html/pages/device/apps/pureftpd.inc.php
 librenms/includes/html/pages/device/apps/redis.inc.php
 librenms/includes/html/pages/device/apps/rrdcached.inc.php
+librenms/includes/html/pages/device/apps/sagan.inc.php
 librenms/includes/html/pages/device/apps/sdfsinfo.inc.php
 librenms/includes/html/pages/device/apps/seafile.inc.php
 librenms/includes/html/pages/device/apps/shoutcast.inc.php
@@ -5755,6 +5886,7 @@ librenms/includes/polling/applications/ntp-client.inc.php
 librenms/includes/polling/applications/ntp-server.inc.php
 librenms/includes/polling/applications/nvidia.inc.php
 librenms/includes/polling/applications/opengridscheduler.inc.php
+librenms/includes/polling/applications/opensearch.inc.php
 librenms/includes/polling/applications/opensips.inc.php
 librenms/includes/polling/applications/os-updates.inc.php
 librenms/includes/polling/applications/php-fpm.inc.php
@@ -5771,6 +5903,7 @@ librenms/includes/polling/applications/puppet-agent.inc.php
 librenms/includes/polling/applications/pureftpd.inc.php
 librenms/includes/polling/applications/redis.inc.php
 librenms/includes/polling/applications/rrdcached.inc.php
+librenms/includes/polling/applications/sagan.inc.php
 librenms/includes/polling/applications/sdfsinfo.inc.php
 librenms/includes/polling/applications/seafile.inc.php
 librenms/includes/polling/applications/shoutcast.inc.php
@@ -5967,7 +6100,7 @@ librenms/includes/static-config.php
 librenms/includes/syslog.php
 librenms/irc.php
 librenms/librenms-service.py
-librenms/librenms.cron
+@comment librenms/librenms.cron
 librenms/librenms.nonroot.cron
 librenms/licenses/
 librenms/licenses/GPLv3-LICENSE.txt
@@ -6612,6 +6745,8 @@ librenms/mibs/barracuda/
 librenms/mibs/barracuda/BARRACUDA-REF-MIB
 librenms/mibs/barracuda/BWS-MIB
 librenms/mibs/barracuda/PHION-MIB
+librenms/mibs/bats/
+librenms/mibs/bats/AATS-MIB
 librenms/mibs/bdcom/
 librenms/mibs/bdcom/BDCOM-MEMORY-POOL-MIB
 librenms/mibs/bdcom/BDCOM-PROCESS-MIB
@@ -9321,6 +9456,7 @@ librenms/mibs/mitsubishi/
 librenms/mibs/mitsubishi/Mitsubishi.mib
 librenms/mibs/mitsubishi/NET-SNMP-MIB
 librenms/mibs/moxa/
+librenms/mibs/moxa/MOXA-AWK4131A-MIB
 librenms/mibs/moxa/MOXA-EDSG508E-MIB
 librenms/mibs/moxa/MOXA-EDSG512E8POE-MIB
 librenms/mibs/moxa/MOXA-EDSP510A8POE-MIB
@@ -10153,6 +10289,8 @@ librenms/mibs/snrerd/
 librenms/mibs/snrerd/SNR-ERD-4
 librenms/mibs/socomec/
 librenms/mibs/socomec/SOCOMECPDU-MIB.mib
+librenms/mibs/solidoptics/
+librenms/mibs/solidoptics/SO-MUX-MIB
 librenms/mibs/sonicwall/
 librenms/mibs/sonicwall/SNWL-COMMON-MIB
 librenms/mibs/sonicwall/SNWL-SSLVPN-MIB
@@ -10568,9 +10706,13 @@ librenms/mibs/zmtel/ZMTEL-ODU-MIB
 librenms/mibs/zte/
 librenms/mibs/zte/ZTE-AN-CHASSIS-MIB
 librenms/mibs/zte/ZTE-AN-ENVMON-MIB
+librenms/mibs/zte/ZTE-AN-IF-MIB
 librenms/mibs/zte/ZTE-AN-OPTICAL-MODULE-MIB
+librenms/mibs/zte/ZTE-AN-PON-BASE-MIB
+librenms/mibs/zte/ZTE-AN-PON-TC-MIB
 librenms/mibs/zte/ZTE-AN-SMI
 librenms/mibs/zte/ZTE-AN-SOFTWARE-MIB
+librenms/mibs/zte/ZTE-AN-TC-MIB
 librenms/mibs/zte/ZXR10-MIB
 librenms/mibs/zyxel/
 librenms/mibs/zyxel/IES5206-MIB
@@ -10745,6 +10887,20 @@ librenms/resources/lang/ru/pagination.php
 librenms/resources/lang/ru/passwords.php
 librenms/resources/lang/ru/preferences.php
 librenms/resources/lang/ru/validation.php
+librenms/resources/lang/sr/
+librenms/resources/lang/sr.json
+librenms/resources/lang/sr/auth.php
+librenms/resources/lang/sr/components.php
+librenms/resources/lang/sr/device.php
+librenms/resources/lang/sr/exceptions.php
+librenms/resources/lang/sr/pagination.php
+librenms/resources/lang/sr/passwords.php
+librenms/resources/lang/sr/plugins.php
+librenms/resources/lang/sr/port.php
+librenms/resources/lang/sr/preferences.php
+librenms/resources/lang/sr/sensors.php
+librenms/resources/lang/sr/widgets.php
+librenms/resources/lang/sr/wireless.php
 librenms/resources/lang/uk/
 librenms/resources/lang/uk.json
 librenms/resources/lang/uk/auth.php