diff options
author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2025-03-13 00:48:00 +0100 |
---|---|---|
committer | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2025-03-13 00:48:00 +0100 |
commit | 54a099ed6d4ae57835095083aa825462eb03f369 (patch) | |
tree | cf7af5c49f0c8ebc5574b0efc1af3871f1717357 /.github | |
parent | 89df16e7503539c2b0da7e95375b470559bb94ec (diff) | |
parent | 02acc76edc5c646af90a6168df61c711aa3d11d6 (diff) | |
download | monitoring-plugins-54a099ed6d4ae57835095083aa825462eb03f369.tar.gz |
Merge branch 'master' into refactor/check_tcp
Diffstat (limited to '.github')
-rw-r--r-- | .github/NPTest.cache | 4 | ||||
-rw-r--r-- | .github/monitoring-plugins.spec | 14 | ||||
-rwxr-xr-x | .github/prepare_debian.sh | 1 |
3 files changed, 3 insertions, 16 deletions
diff --git a/.github/NPTest.cache b/.github/NPTest.cache index d488d1b9..6b463e74 100644 --- a/.github/NPTest.cache +++ b/.github/NPTest.cache | |||
@@ -38,8 +38,8 @@ | |||
38 | 'NP_MYSQL_LOGIN_DETAILS' => '-u root -d test', | 38 | 'NP_MYSQL_LOGIN_DETAILS' => '-u root -d test', |
39 | 'NP_MYSQL_SERVER' => 'localhost', | 39 | 'NP_MYSQL_SERVER' => 'localhost', |
40 | 'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock', | 40 | 'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock', |
41 | 'NP_MYSQL_WITH_SLAVE' => '', | 41 | 'NP_MYSQL_WITH_REPLICA' => '', |
42 | 'NP_MYSQL_WITH_SLAVE_LOGIN' => '', | 42 | 'NP_MYSQL_WITH_REPLICA_LOGIN' => '', |
43 | 'NP_NO_NTP_SERVICE' => 'localhost', | 43 | 'NP_NO_NTP_SERVICE' => 'localhost', |
44 | 'NP_PORT_TCP_PROXY' => '3128', | 44 | 'NP_PORT_TCP_PROXY' => '3128', |
45 | 'NP_SMB_SHARE' => '', | 45 | 'NP_SMB_SHARE' => '', |
diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec index 5cae3e59..64ee34f2 100644 --- a/.github/monitoring-plugins.spec +++ b/.github/monitoring-plugins.spec | |||
@@ -193,7 +193,6 @@ Requires: %{name}-ntp_peer | |||
193 | Requires: %{name}-ntp_time | 193 | Requires: %{name}-ntp_time |
194 | Requires: %{name}-nwstat | 194 | Requires: %{name}-nwstat |
195 | Requires: %{name}-oracle | 195 | Requires: %{name}-oracle |
196 | Requires: %{name}-overcr | ||
197 | Requires: %{name}-pgsql | 196 | Requires: %{name}-pgsql |
198 | Requires: %{name}-ping | 197 | Requires: %{name}-ping |
199 | Requires: %{name}-procs | 198 | Requires: %{name}-procs |
@@ -729,19 +728,6 @@ Provides check_oracle of the Monitoring Plugins. | |||
729 | 728 | ||
730 | 729 | ||
731 | 730 | ||
732 | # check_overcr | ||
733 | %package overcr | ||
734 | Summary: Monitoring Plugins - check_overcr | ||
735 | Requires: %{name} = %{version}-%{release} | ||
736 | |||
737 | %description overcr | ||
738 | Provides check_overcr of the Monitoring Plugins. | ||
739 | |||
740 | %files overcr | ||
741 | %{plugindir}/check_overcr | ||
742 | |||
743 | |||
744 | |||
745 | # check_pgsql | 731 | # check_pgsql |
746 | %package pgsql | 732 | %package pgsql |
747 | Summary: Monitoring Plugins - check_pgsql | 733 | Summary: Monitoring Plugins - check_pgsql |
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh index c79211cd..f7b6cf9f 100755 --- a/.github/prepare_debian.sh +++ b/.github/prepare_debian.sh | |||
@@ -59,6 +59,7 @@ apt-get -y install perl \ | |||
59 | mariadb-server \ | 59 | mariadb-server \ |
60 | mariadb-client \ | 60 | mariadb-client \ |
61 | libmariadb-dev \ | 61 | libmariadb-dev \ |
62 | libmariadb-dev-compat \ | ||
62 | cron \ | 63 | cron \ |
63 | iputils-ping \ | 64 | iputils-ping \ |
64 | iproute2 \ | 65 | iproute2 \ |