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

diff --git a/bacula/examples/nagios/nagios_plugin_check_bacula.tgz b/bacula/examples/nagios/nagios_plugin_check_bacula.tgz
index d9aaa6215917b513866047025751ee1b69ecbd5b..229dad743ba5d7fc31220b1643abc7775cd33988 100644 (file)
Binary files a/bacula/examples/nagios/nagios_plugin_check_bacula.tgz and b/bacula/examples/nagios/nagios_plugin_check_bacula.tgz differ

diff --git a/bacula/src/qt-console/console/console.ui b/bacula/src/qt-console/console/console.ui
index f491ac74067984b58d726a140ddb44362b1df2be..0f304b915587c4e2af0fdd5a765a9dde80777977 100644 (file)
--- 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 306aea39d6372b34068f70fc496d0574769ddbcc..f7627bdade2238708f748f002e630ffb7d40bd3e 100644 (file)
--- 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 d85cb132c20663041a0ea3c4297ae33b617be0cc..ada44b6eb28ca5fb18715b328def0ffa3737046a 100644 (file)
--- 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 f35c71be45b40303009dbbbd761fa728ac8cd424..8303e605cce2d3bda615d34b01fea51e8a0c2eee 100644 (file)
--- 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 4e70ba2d6557a8a5657e086bbcdd7de7afeb3883..ce4f11bc22c3d6053ae2a5be33d0716b707f305e 100644 (file)
--- 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 64f4780870e1852598b8b26b0d199964132bfbae..268b2821eac02aa05a1d04c18a636af32702ff92 100644 (file)
--- 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