Module: check_mk
Branch: master
Commit: 57db40decb5d275fb7a31d81c819098a40d87b92
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57db40decb5d27…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Jan 12 11:50:24 2018 +0100
Get rid of a harmful site.py.
In the long run, we should install our own Python packages in a way that we
don't have to set PYTHONPATH for the site user. Everything else is a recipe
for blood, sweat and tears... :-/
Change-Id: I9751e75b8f32bf6122168e21633c2c8072b48c28
---
omd/packages/net-snmp/Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/omd/packages/net-snmp/Makefile b/omd/packages/net-snmp/Makefile
index 07578be..3f57682 100644
--- a/omd/packages/net-snmp/Makefile
+++ b/omd/packages/net-snmp/Makefile
@@ -38,6 +38,12 @@ install:
--prefix='' \
--install-platlib=$(DESTDIR)$(OMD_ROOT)/lib/python \
--install-purelib=$(DESTDIR)$(OMD_ROOT)/lib/python
+# For some obscure reason beyond the mental capacities of mere humans, the
+# easy_install mechanism triggered by the setup call above results in the
+# creation of a lib/python/site.py, a copy of site-patch.py from setuptools.
+# Having this in the PYTHONPATH makes it impossible to run python3-based SW as a
+# site user, including gdb! So let's simply nuke it here...
+ $(RM) $(DESTDIR)$(OMD_ROOT)/lib/python/site.py
skel:
Module: check_mk
Branch: master
Commit: 837f3022d7f2de6c32a186fedb6b8105ec4aeb9d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=837f3022d7f2de…
Author: Tom Baerwinkel <tb(a)mathias-kettner.de>
Date: Wed Jan 10 16:07:10 2018 +0100
5488 FIX veeam_jobs: Add support for new veeam API
The new veeam API only supports StartTimeLocal and StopTimeLocal. The old API
using StartTime and StopTime is not supported anymore. This lead to the error
that backup jobs using the new API were shown as "No complete backup". This
change adds support for StartTimeLocal and StopTimeLocal while maintaining
compatibility to the old API.
Change-Id: I787f79b8239a451232ce8ccb90d59a33d8d93f50
---
.werks/5488 | 14 ++++++++++++++
agents/windows/plugins/veeam_backup_status.ps1_ | 16 ++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/.werks/5488 b/.werks/5488
new file mode 100644
index 0000000..c306ab9
--- /dev/null
+++ b/.werks/5488
@@ -0,0 +1,14 @@
+Title: veeam_jobs: Add support for new veeam API
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i3
+Date: 1515682965
+Class: fix
+
+The new veeam API only supports StartTimeLocal and StopTimeLocal. The old API
+using StartTime and StopTime is not supported anymore. This lead to the error
+that backup jobs using the new API were shown as "No complete backup". This
+change adds support for StartTimeLocal and StopTimeLocal while maintaining
+compatibility to the old API.
diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_
index 493542b..ade6f9f 100644
--- a/agents/windows/plugins/veeam_backup_status.ps1_
+++ b/agents/windows/plugins/veeam_backup_status.ps1_
@@ -101,11 +101,23 @@ foreach ($myJob in $myBackupJobs)
$myTaskText = "$myTaskText" + "TransferedSizeByte" + "`t" + "$myTaskTransferedSize" + "`n"
- $myTaskStartTime = $myTask.Progress.StartTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue
+ # Starting from Version 9.5U3 StartTime is not supported anymore
+ If ($myTask.Progress.StartTime -eq $Null) {
+ $myTaskStartTime = $myTask.Progress.StartTimeLocal
+ } Else {
+ $myTaskStartTime = $myTask.Progress.StartTime
+ }
+ $myTaskStartTime = $myTaskStartTime | Get-Date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue
$myTaskText = "$myTaskText" + "StartTime" + "`t" + "$myTaskStartTime" + "`n"
- $myTaskStopTime = $myTask.Progress.StopTime | get-date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue
+ # Starting from Version 9.5U3 StopTime is not supported anymore
+ If ($myTask.Progress.StopTime -eq $Null) {
+ $myTaskStopTime = $myTask.Progress.StopTimeLocal
+ } Else {
+ $myTaskStopTime = $myTask.Progress.StopTime
+ }
+ $myTaskStopTime = $myTaskStopTime | Get-Date -Format "dd.MM.yyyy HH\:mm\:ss" -ErrorAction SilentlyContinue
$myTaskText = "$myTaskText" + "StopTime" + "`t" + "$myTaskStopTime" + "`n"
Module: check_mk
Branch: master
Commit: 1cf54b3763431df15d46948d5743d9018009086d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf54b3763431d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 11 16:12:41 2018 +0100
Fixed werk text
Change-Id: I307b260201cffcc978929f31caf8602274e6b65d
---
.werks/5633 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.werks/5633 b/.werks/5633
index 45e2d8f..4efb493 100644
--- a/.werks/5633
+++ b/.werks/5633
@@ -36,7 +36,7 @@ the current metrics of this service.
<li><i>Linear</i>: The first segment of the displayed values is used</li>
<li><i>Stacked</i>: The sort value of the first stacked perfometer is used</li>
<li><i>Dual<i>: The maximum of both displayed value is used for sorting</li>
-<ul>
+</ul>
The sorting only works for perfometers that are implemented as metric plugin
(in <tt>plugins/metrics/</tt>). The legacy perfometers that are implemented as perfometer
Module: check_mk
Branch: master
Commit: 4d123d9a9835fb9d6fa7ae2be4f2bee1572785bc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d123d9a9835fb…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 19 09:20:51 2017 +0100
5633 It is now possible to sort by the perfometer column
The service list status views of Check_MK can now be sorted by the column "Perf-O-Meter".
The sorting of the perfometers is sorted by these values:
<ol>
<li>First sort by the optional perfometer group or perfometer ID</li>
<li>Second sort by the sort value of each perfometer</li>
</ol>
<strong>The Perfometer group / perfometer ID</strong>
Each perfometer declaration can have an optional element <tt>sort_group</tt>. This element
holds a string that can be used to group different perfometers (that visualize comparable values)
together.
In case no <tt>sort_group</tt> is defined, the internal ID of the perfometer definition is used.
This means that all perfometers which are rendered by the same logical function are sorted together
in a perfometer group.
<strong>The sort value</strong>
The sort value of a perfometer is calculated in different ways for each perfometer type based on
the current metrics of this service.
<ul>
<li><i>Logarithmic</i>: The single logarithmic value displayed by this perfometer is used</li>
<li><i>Linear</i>: The first segment of the displayed values is used</li>
<li><i>Stacked</i>: The sort value of the first stacked perfometer is used</li>
<li><i>Dual<i>: The maximum of both displayed value is used for sorting</li>
<ul>
The sorting only works for perfometers that are implemented as metric plugin
(in <tt>plugins/metrics/</tt>). The legacy perfometers that are implemented as perfometer
plugins can not be sorted.
Dear check developers: All perfometers that visualize equal types of values have to be
sorted together in a sort group. For example all checks that monitor fileystems should have
equal perfometers that can be compared to each other and should therefor be sortable by their
disk usage.
Change-Id: Idbf187b8b6fa8f9d5eee36b98b2038341687a587
---
.werks/5633 | 48 ++++++
web/htdocs/metrics.py | 157 ++++++++++++-------
web/plugins/metrics/check_mk.py | 5 +
web/plugins/perfometer/check_mk.py | 1 -
web/plugins/views/perfometer.py | 310 ++++++++++++++++++++++++++++---------
5 files changed, 393 insertions(+), 128 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d123d9a98…