From d714b26084986ce0f322958ebbd37cee75a639cc Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 7 Mar 2007 13:32:10 +0000
Subject: [PATCH] Add updated nagios plugin supplied by Christian Masopust.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4329 91ce42f0-d328-0410-95d8-f526ca767f89
---
 .../nagios/nagios_plugin_check_bacula.tgz     | Bin 5827 -> 6278 bytes
 bacula/src/qt-console/console/console.ui      |  19 +-
 bacula/src/qt-console/mainwin.cpp             |   7 +-
 bacula/src/qt-console/restore/brestore.cpp    |   7 +-
 bacula/src/qt-console/restore/brestore.ui     | 515 +++++++++---------
 bacula/src/version.h                          |   4 +-
 bacula/technotes-2.1                          |   2 +
 7 files changed, 297 insertions(+), 257 deletions(-)

diff --git a/bacula/examples/nagios/nagios_plugin_check_bacula.tgz b/bacula/examples/nagios/nagios_plugin_check_bacula.tgz
index d9aaa6215917b513866047025751ee1b69ecbd5b..229dad743ba5d7fc31220b1643abc7775cd33988 100644
GIT binary patch
literal 6278
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

literal 5827
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
Nycdv3)NcTI008XGXAuAZ

diff --git a/bacula/src/qt-console/console/console.ui b/bacula/src/qt-console/console/console.ui
index f491ac7406..0f304b9155 100644
--- a/bacula/src/qt-console/console/console.ui
+++ b/bacula/src/qt-console/console/console.ui
@@ -21,8 +21,17 @@
    </property>
    <item row="0" column="0" >
     <widget class="QDockWidget" name="dockWidget" >
+     <property name="focusPolicy" >
+      <enum>Qt::StrongFocus</enum>
+     </property>
+     <property name="windowIcon" >
+      <iconset>../images/print.png</iconset>
+     </property>
+     <property name="features" >
+      <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
+     </property>
      <property name="allowedAreas" >
-      <set>Qt::AllDockWidgetAreas</set>
+      <set>Qt::NoDockWidgetArea</set>
      </property>
      <widget class="QWidget" name="dockWidgetContents" >
       <property name="focusPolicy" >
@@ -58,7 +67,7 @@
           </size>
          </property>
          <property name="focusPolicy" >
-          <enum>Qt::NoFocus</enum>
+          <enum>Qt::StrongFocus</enum>
          </property>
          <property name="acceptDrops" >
           <bool>false</bool>
@@ -75,6 +84,12 @@
          <property name="horizontalScrollBarPolicy" >
           <enum>Qt::ScrollBarAsNeeded</enum>
          </property>
+         <property name="autoFormatting" >
+          <set>QTextEdit::AutoNone</set>
+         </property>
+         <property name="tabChangesFocus" >
+          <bool>false</bool>
+         </property>
          <property name="documentTitle" >
           <string comment="Console Window" />
          </property>
diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 306aea39d6..f7627bdade 100644
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -69,7 +69,6 @@ void MainWin::keyPressEvent(QKeyEvent *event)
    }
    switch (event->key()) {
    case Qt::Key_Down:
-//    Dmsg0(000, "Down key pressed\n");
       if (m_cmd_last < 0 || m_cmd_last >= (m_cmd_history.size()-1)) {
          event->ignore();
          return;
@@ -77,7 +76,6 @@ void MainWin::keyPressEvent(QKeyEvent *event)
       m_cmd_last++;
       break;
    case Qt::Key_Up:
-//    Dmsg0(000, "Up key pressed\n");
       if (m_cmd_last == 0) {
          event->ignore();
          return;
@@ -224,17 +222,14 @@ void MainWin::set_statusf(const char *fmt, ...)
    len = bvsnprintf(buf, sizeof(buf), fmt, arg_ptr);
    va_end(arg_ptr);
    set_status(buf);
-// set_scroll_bar_to_end();
 }
 
 void MainWin::set_status_ready()
 {
    set_status(" Ready");
-// set_scroll_bar_to_end();
 }
 
 void MainWin::set_status(const char *buf)
 {
    statusBar()->showMessage(buf);
-// ready = false;
 }
diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index d85cb132c2..ada44b6eb2 100644
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -31,7 +31,7 @@
  *
  *  bRestore Class  (Eric's brestore)
  *
- *   Kern Sibbald, January MMVI
+ *   Kern Sibbald, January MMVII
  *
  */ 
 
@@ -40,6 +40,7 @@
 
 bRestore::bRestore(QStackedWidget *parent)
 {
+   (void)parent;
    setupUi(this);
-   parent->addWidget(this);
+// parent->addWidget(this);
 }
diff --git a/bacula/src/qt-console/restore/brestore.ui b/bacula/src/qt-console/restore/brestore.ui
index f35c71be45..8303e605cc 100644
--- a/bacula/src/qt-console/restore/brestore.ui
+++ b/bacula/src/qt-console/restore/brestore.ui
@@ -5,276 +5,148 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>600</height>
+    <width>1023</width>
+    <height>796</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>7</hsizetype>
+    <vsizetype>7</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>brestore</string>
   </property>
-  <widget class="QWidget" name="centralwidget" >
+  <widget class="QDockWidget" name="dockWidget" >
    <property name="geometry" >
     <rect>
-     <x>70</x>
-     <y>30</y>
-     <width>582</width>
-     <height>533</height>
+     <x>10</x>
+     <y>20</y>
+     <width>951</width>
+     <height>661</height>
     </rect>
    </property>
-   <layout class="QVBoxLayout" >
-    <property name="margin" >
-     <number>9</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QComboBox" name="ClientList" />
-      </item>
-      <item>
-       <widget class="QComboBox" name="JobList" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushButton_4" >
-        <property name="text" >
-         <string>Location</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="lineEdit" />
-      </item>
-     </layout>
-    </item>
-    <item>
-     <widget class="QSplitter" name="splitter_2" >
+   <property name="sizePolicy" >
+    <sizepolicy>
+     <hsizetype>7</hsizetype>
+     <vsizetype>7</vsizetype>
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="features" >
+    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
+   </property>
+   <widget class="QWidget" name="dockWidgetContents" >
+    <widget class="QSplitter" name="splitter_2" >
+     <property name="geometry" >
+      <rect>
+       <x>30</x>
+       <y>50</y>
+       <width>861</width>
+       <height>543</height>
+      </rect>
+     </property>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <widget class="QSplitter" name="splitter" >
       <property name="orientation" >
-       <enum>Qt::Vertical</enum>
+       <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="QSplitter" name="splitter" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
+      <widget class="QGroupBox" name="groupBox" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>7</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title" >
+        <string>File list</string>
        </property>
-       <widget class="QGroupBox" name="groupBox" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>7</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>9</number>
         </property>
-        <property name="title" >
-         <string>File list</string>
+        <property name="spacing" >
+         <number>6</number>
         </property>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
-          <number>9</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QTableWidget" name="FileList" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>7</vsizetype>
-             <horstretch>5</horstretch>
-             <verstretch>5</verstretch>
-            </sizepolicy>
+        <item>
+         <widget class="QTableWidget" name="FileList" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>7</vsizetype>
+            <horstretch>5</horstretch>
+            <verstretch>5</verstretch>
+           </sizepolicy>
+          </property>
+          <column>
+           <property name="text" >
+            <string>Type</string>
            </property>
-           <column>
-            <property name="text" >
-             <string>Type</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>File Name</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Size</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Date</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QGroupBox" name="groupBox_2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>7</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="title" >
-         <string>File revisions</string>
-        </property>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
-          <number>9</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QTableWidget" name="FileRevisions" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>7</vsizetype>
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
+          </column>
+          <column>
+           <property name="text" >
+            <string>File Name</string>
            </property>
-           <column>
-            <property name="text" >
-             <string>InChanger</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Volume</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>JobId</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Size</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Date</string>
-            </property>
-           </column>
-           <column>
-            <property name="text" >
-             <string>Chksum</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+          </column>
+          <column>
+           <property name="text" >
+            <string>Size</string>
+           </property>
+          </column>
+          <column>
+           <property name="text" >
+            <string>Date</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
       </widget>
-      <widget class="QWidget" name="layoutWidget_2" >
+      <widget class="QGroupBox" name="groupBox_2" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>7</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title" >
+        <string>File revisions</string>
+       </property>
        <layout class="QVBoxLayout" >
         <property name="margin" >
-         <number>0</number>
+         <number>9</number>
         </property>
         <property name="spacing" >
          <number>6</number>
         </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="label" >
-            <property name="text" >
-             <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Restore items list&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="pushButton" >
-            <property name="text" >
-             <string>Clear</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="pushButton_2" >
-            <property name="text" >
-             <string>Estimate</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="pushButton_3" >
-            <property name="text" >
-             <string>Restore</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QTableWidget" name="RestoreList" >
-          <property name="acceptDrops" >
-           <bool>true</bool>
+         <widget class="QTableWidget" name="FileRevisions" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>7</hsizetype>
+            <vsizetype>7</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
           <column>
            <property name="text" >
-            <string>Type</string>
+            <string>InChanger</string>
            </property>
           </column>
           <column>
            <property name="text" >
-            <string>FileName</string>
+            <string>Volume</string>
            </property>
           </column>
           <column>
@@ -284,17 +156,17 @@ p, li { white-space: pre-wrap; }
           </column>
           <column>
            <property name="text" >
-            <string>FileIndex</string>
+            <string>Size</string>
            </property>
           </column>
           <column>
            <property name="text" >
-            <string>Nb Files</string>
+            <string>Date</string>
            </property>
           </column>
           <column>
            <property name="text" >
-            <string>Size</string>
+            <string>Chksum</string>
            </property>
           </column>
          </widget>
@@ -302,8 +174,163 @@ p, li { white-space: pre-wrap; }
        </layout>
       </widget>
      </widget>
-    </item>
-   </layout>
+     <widget class="QWidget" name="layoutWidget_2" >
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label" >
+           <property name="text" >
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Restore items list&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushButton" >
+           <property name="text" >
+            <string>Clear</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushButton_2" >
+           <property name="text" >
+            <string>Estimate</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushButton_3" >
+           <property name="text" >
+            <string>Restore</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QTableWidget" name="RestoreList" >
+         <property name="acceptDrops" >
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text" >
+           <string>Type</string>
+          </property>
+         </column>
+         <column>
+          <property name="text" >
+           <string>FileName</string>
+          </property>
+         </column>
+         <column>
+          <property name="text" >
+           <string>JobId</string>
+          </property>
+         </column>
+         <column>
+          <property name="text" >
+           <string>FileIndex</string>
+          </property>
+         </column>
+         <column>
+          <property name="text" >
+           <string>Nb Files</string>
+          </property>
+         </column>
+         <column>
+          <property name="text" >
+           <string>Size</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="layoutWidget" >
+     <property name="geometry" >
+      <rect>
+       <x>40</x>
+       <y>10</y>
+       <width>861</width>
+       <height>33</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QComboBox" name="ClientList" />
+      </item>
+      <item>
+       <widget class="QComboBox" name="JobList" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_4" >
+        <property name="text" >
+         <string>Location</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="lineEdit" />
+      </item>
+     </layout>
+    </widget>
+   </widget>
   </widget>
  </widget>
  <resources/>
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4e70ba2d65..ce4f11bc22 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.4"
-#define BDATE   "05 March 2007"
-#define LSMDATE "05Mar07"
+#define BDATE   "06 March 2007"
+#define LSMDATE "06Mar07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 64f4780870..268b2821ea 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,8 @@
               Technical notes on version 2.1
 
 General:
+07Mar07
+kes  Add updated nagios plugin supplied by Christian Masopust.
 05Mar07
 kes  More bat implementation.
 kes  File migrate bug with Pool Occupancy using mediaid instead
-- 
2.39.5