From: Kern Sibbald Date: Wed, 7 Mar 2007 13:32:10 +0000 (+0000) Subject: Add updated nagios plugin supplied by Christian Masopust. X-Git-Tag: Release-7.0.0~6777 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d714b26084986ce0f322958ebbd37cee75a639cc;p=bacula%2Fbacula 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 d9aaa62159..229dad743b 100644 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 f491ac7406..0f304b9155 100644 --- a/bacula/src/qt-console/console/console.ui +++ b/bacula/src/qt-console/console/console.ui @@ -21,8 +21,17 @@ + + Qt::StrongFocus + + + ../images/print.png + + + QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures + - Qt::AllDockWidgetAreas + Qt::NoDockWidgetArea @@ -58,7 +67,7 @@ - Qt::NoFocus + Qt::StrongFocus false @@ -75,6 +84,12 @@ Qt::ScrollBarAsNeeded + + QTextEdit::AutoNone + + + false + 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 @@ 0 0 - 800 - 600 + 1023 + 796 + + + 7 + 7 + 0 + 0 + + brestore - + - 70 - 30 - 582 - 533 + 10 + 20 + 951 + 661 - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - Location - - - - - - - - - - + + + 7 + 7 + 0 + 0 + + + + QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures + + + + + + 30 + 50 + 861 + 543 + + + + Qt::Vertical + + - Qt::Vertical + Qt::Horizontal - - - Qt::Horizontal + + + + 7 + 7 + 0 + 0 + + + + File list - - - - 7 - 7 - 0 - 0 - + + + 9 - - File list + + 6 - - - 9 - - - 6 - - - - - - 7 - 7 - 5 - 5 - + + + + + 7 + 7 + 5 + 5 + + + + + Type - - - Type - - - - - File Name - - - - - Size - - - - - Date - - - - - - - - - - 7 - 7 - 0 - 0 - - - - File revisions - - - - 9 - - - 6 - - - - - - 7 - 7 - 0 - 0 - + + + + File Name - - - InChanger - - - - - Volume - - - - - JobId - - - - - Size - - - - - Date - - - - - Chksum - - - - - - + + + + Size + + + + + Date + + + + + - + + + + 7 + 7 + 0 + 0 + + + + File revisions + - 0 + 9 6 - - - 0 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Restore items list</span></p></body></html> - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Clear - - - - - - - Estimate - - - - - - - Restore - - - - - - - - - true + + + + 7 + 7 + 0 + 0 + - Type + InChanger - FileName + Volume @@ -284,17 +156,17 @@ p, li { white-space: pre-wrap; } - FileIndex + Size - Nb Files + Date - Size + Chksum @@ -302,8 +174,163 @@ p, li { white-space: pre-wrap; } - - + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Restore items list</span></p></body></html> + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Clear + + + + + + + Estimate + + + + + + + Restore + + + + + + + + + true + + + + Type + + + + + FileName + + + + + JobId + + + + + FileIndex + + + + + Nb Files + + + + + Size + + + + + + + + + + + 40 + 10 + 861 + 33 + + + + + 0 + + + 6 + + + + + + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + Location + + + + + + + + + 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