Attachment 3451 Details for Bug 22894

[patch] Patch legt Modul univention-management-console-module-mrtg an

univention-management-console-module-mrtg.patch (text/plain), 18.52 KB, created by Frank Greif on 2011-08-18 09:43 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Greif

Created: 2011-08-18 09:43 CEST

Size: 18.52 KB

patch

obsolete

>Index: debian/control
>===================================================================
>--- debian/control	(revision 0)
>+++ debian/control	(revision 0)
>@@ -0,0 +1,21 @@
>+Source: univention-management-console-module-mrtg
>+Section: univention
>+Priority: optional
>+Maintainer: Univention GmbH <packages@univention.de>
>+Build-Depends: debhelper (>= 7.0.50~),
>+ python-support,
>+ univention-management-console-dev,
>+ python-all
>+Standards-Version: 3.5.2
>+XS-Python-Version: all
>+
>+Package: univention-management-console-module-mrtg
>+Architecture: all
>+Depends: univention-management-console-server
>+Description: UMC module for system statistics
>+ This package contains the UMC module for the system statistics section
>+ .
>+ It is part of Univention Corporate Server (UCS), an
>+ integrated, directory driven solution for managing
>+ corporate environments. For more information about UCS,
>+ refer to: http://www.univention.de/
>Index: debian/compat
>===================================================================
>--- debian/compat	(revision 0)
>+++ debian/compat	(revision 0)
>@@ -0,0 +1 @@
>+7
>Index: debian/changelog
>===================================================================
>--- debian/changelog	(revision 0)
>+++ debian/changelog	(revision 0)
>@@ -0,0 +1,5 @@
>+univention-management-console-module-mrtg (1.0.0-1) unstable; urgency=low
>+
>+  * Initial release (Bug #22848)
>+
>+ -- Frank Greif <fg@it25.de>  Tue, 16 Aug 2011 09:40:22 +0200
>Index: debian/copyright
>===================================================================
>--- debian/copyright	(revision 0)
>+++ debian/copyright	(revision 0)
>@@ -0,0 +1,27 @@
>+Copyright 2011 Univention GmbH
>+
>+http://www.univention.de/
>+
>+All rights reserved.
>+
>+The source code of the software contained in this package
>+as well as the source package itself are made available
>+under the terms of the GNU Affero General Public License version 3
>+(GNU AGPL V3) as published by the Free Software Foundation.
>+
>+Binary versions of this package provided by Univention to you as
>+well as other copyrighted, protected or trademarked materials like
>+Logos, graphics, fonts, specific documentations and configurations,
>+cryptographic keys etc. are subject to a license agreement between
>+you and Univention and not subject to the GNU AGPL V3.
>+
>+In the case you use the software under the terms of the GNU AGPL V3,
>+the program is provided in the hope that it will be useful,
>+but WITHOUT ANY WARRANTY; without even the implied warranty of
>+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+GNU Affero General Public License for more details.
>+
>+You should have received a copy of the GNU Affero General Public
>+License with the Debian GNU/Linux or Univention distribution in file
>+/usr/share/common-licenses/AGPL-3; if not, see
>+<http://www.gnu.org/licenses/>.
>Index: debian/rules
>===================================================================
>--- debian/rules	(revision 0)
>+++ debian/rules	(revision 0)
>@@ -0,0 +1,42 @@
>+#!/usr/bin/make -f
>+#
>+# Mrtg
>+#  rules file for the debian package
>+#
>+# Copyright 2004-2011 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+
>+%:
>+	dh $@
>+
>+override_dh_auto_build:
>+	dh-umc-module-build
>+	dh_auto_build
>+
>+override_dh_auto_install:
>+	dh-umc-module-install
>+	dh_auto_install
>
>Property changes on: debian/rules
>___________________________________________________________________
>Added: svn:executable
>   + *
>
>Index: debian/univention-management-console-module-mrtg.umc-modules
>===================================================================
>--- debian/univention-management-console-module-mrtg.umc-modules	(revision 0)
>+++ debian/univention-management-console-module-mrtg.umc-modules	(revision 0)
>@@ -0,0 +1,7 @@
>+Module: mrtg
>+Python: umc/module
>+Definition: umc/mrtg.xml
>+Javascript: umc/js
>+Icons: umc/icons
>+Syntax: umc/syntax/mrtg.xml
>+
>Index: umc/module/mrtg/de.po
>===================================================================
>--- umc/module/mrtg/de.po	(revision 0)
>+++ umc/module/mrtg/de.po	(revision 0)
>@@ -0,0 +1,14 @@
>+# This file is auto-generated by the dh-umc tools and should not be edited!
>+#, fuzzy
>+msgid ""
>+msgstr ""
>+"Project-Id-Version: univention-management-console-module-mrtg\n"
>+"Report-Msgid-Bugs-To: packages@univention.de\n"
>+"POT-Creation-Date: 2011-08-16 12:22+0200\n"
>+"PO-Revision-Date: 2011-08-18 09:15+0200\n"
>+"Last-Translator: Frank Greif <fg@it25.de>\n"
>+"Language-Team: LANGUAGE <LL@li.org>\n"
>+"Language: de\n"
>+"MIME-Version: 1.0\n"
>+"Content-Type: text/plain; charset=UTF-8\n"
>+"Content-Transfer-Encoding: 8bit\n"
>Index: umc/module/mrtg/__init__.py
>===================================================================
>--- umc/module/mrtg/__init__.py	(revision 0)
>+++ umc/module/mrtg/__init__.py	(revision 0)
>@@ -0,0 +1,49 @@
>+#!/usr/bin/python2.6
>+# -*- coding: utf-8 -*-
>+#
>+# Univention Management Console
>+#  module: system usage statistics
>+#
>+# Copyright 2011 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+
>+import subprocess
>+import univention.info_tools as uit
>+import univention.management.console as umc
>+import univention.management.console.modules as umcm
>+
>+from univention.management.console.log import MODULE
>+from univention.management.console.protocol.definitions import *
>+
>+_ = umc.Translation('univention-management-console-modules-mrtg').translate
>+
>+# Teststring zum Wiederfinden
>+
>+class Instance(umcm.Base):
>+	def init(self):
>+		uit.set_language(str(self.locale))
>+
>Index: umc/de.po
>===================================================================
>--- umc/de.po	(revision 0)
>+++ umc/de.po	(revision 0)
>@@ -0,0 +1,19 @@
>+# This file is auto-generated by the dh-umc tools and should not be edited!
>+msgid ""
>+msgstr ""
>+"Project-Id-Version: univention-management-console-module-mrtg\n"
>+"Report-Msgid-Bugs-To: packages@univention.de\n"
>+"POT-Creation-Date: Tue, 16 Aug 2011 12:22:50 +0200\n"
>+"PO-Revision-Date: Thu, 18 Aug 2011 09:15:00 +0200\n"
>+"Last-Translator: Frank Greif <fg@it25.de>\n"
>+"Language-Team: Univention GmbH <packages@univention.de>\n"
>+"Language: de\n"
>+"MIME-Version: 1.0\n"
>+"Content-Type: text/plain; charset=UTF-8\n"
>+"Content-Transfer-Encoding: 8bit\n"
>+
>+msgid "Show system usage statistics"
>+msgstr "System-Statistiken anzeigen"
>+
>+msgid "Statistics"
>+msgstr "Statistiken"
>Index: umc/syntax/mrtg.xml
>===================================================================
>--- umc/syntax/mrtg.xml	(revision 0)
>+++ umc/syntax/mrtg.xml	(revision 0)
>@@ -0,0 +1,5 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<umc version="2.0">
>+  <definitions>
>+  </definitions>
>+</umc>
>Index: umc/mrtg.xml
>===================================================================
>--- umc/mrtg.xml	(revision 0)
>+++ umc/mrtg.xml	(revision 0)
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<umc version="2.0">
>+  <module id="mrtg" icon="mrtg" version="1.0">
>+	<name>Statistics</name>
>+	<description>Show system usage statistics</description>
>+	<categories>
>+	  <category name="system"/>
>+	</categories>
>+	
>+	<command name="mrtg/show" function="show">
>+	</command>
>+  </module>
>+</umc>
>Index: umc/icons/32x32/mrtg.png
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>
>Property changes on: umc/icons/32x32/mrtg.png
>___________________________________________________________________
>Added: svn:mime-type
>   + application/octet-stream
>
>Index: umc/icons/24x24/mrtg.png
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>
>Property changes on: umc/icons/24x24/mrtg.png
>___________________________________________________________________
>Added: svn:mime-type
>   + application/octet-stream
>
>Index: umc/icons/16x16/mrtg.png
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>
>Property changes on: umc/icons/16x16/mrtg.png
>___________________________________________________________________
>Added: svn:mime-type
>   + application/octet-stream
>
>Index: umc/icons/scalable/mrtg.svgz
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>
>Property changes on: umc/icons/scalable/mrtg.svgz
>___________________________________________________________________
>Added: svn:mime-type
>   + application/octet-stream
>
>Index: umc/icons/64x64/mrtg.png
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>
>Property changes on: umc/icons/64x64/mrtg.png
>___________________________________________________________________
>Added: svn:mime-type
>   + application/octet-stream
>
>Index: umc/js/mrtg.js
>===================================================================
>--- umc/js/mrtg.js	(revision 0)
>+++ umc/js/mrtg.js	(revision 0)
>@@ -0,0 +1,133 @@
>+/* global console MyError dojo dojox dijit umc */
>+
>+dojo.provide("umc.modules.mrtg");
>+
>+dojo.require("umc.i18n");
>+dojo.require("umc.widgets.ContainerWidget");
>+dojo.require("umc.widgets.Module");
>+dojo.require("umc.widgets.Page");
>+dojo.require("umc.widgets.Text");
>+dojo.require("umc.widgets.ExpandingTitlePane");
>+dojo.require("umc.widgets.ContainerForm");
>+dojo.require("umc.widgets.TabbedModule");
>+dojo.require("dojox.layout.TableContainer");
>+dojo.require("dojox.string.sprintf");
>+
>+// Inheriting from umc.widgets.TabbedModule so any pages being added
>+// will become tabs automatically.
>+dojo.declare("umc.modules.mrtg", [ umc.widgets.TabbedModule, umc.i18n.Mixin ], {
>+
>+	_page: null,
>+	_form: null,
>+	
>+	// TODO should be set in the base class -> then remove it here.
>+	nested: true,		// my tabs are 2nd level
>+
>+	i18nClass: 'umc.modules.mrtg',
>+
>+	buildRendering: function() {
>+		this.inherited(arguments);
>+		
>+		// key ...... the file name stub for all images on this tab
>+		// label .... the label of the tab itself
>+		// heading .. page heading of the tab contents
>+		// desc ..... help text (switchable)
>+		var page_setup = [
>+			{
>+				key:		"0load",
>+				label:		this._("Load"),
>+				heading:	this._("System load"),
>+				desc:		this._("System load in percent")
>+			},
>+			{
>+				key:		"1sessions",
>+				label:		this._("Sessions"),
>+				heading:	this._("Terminal server sessions"),
>+				desc:		this._("Number of active terminal server sessions")
>+			},
>+			{
>+				key:		"2mem",
>+				label:		this._("Memory"),
>+				heading:	this._("Memory usage"),
>+				desc:		this._("Utilization of system memory in percent")
>+			},
>+			{
>+				key:		"3swap",
>+				label:		this._("Swap"),
>+				heading:	this._("Swap space"),
>+				desc:		this._("Utilization of swap space in percent")
>+			}
>+		];
>+		
>+		// key ...... file name stub (2nd part) for the corresponding PNG image
>+		// label .... how to label this image
>+		var tab_setup = [
>+			{
>+				key:		"day",
>+				label:		this._("previous day")
>+			},
>+			{
>+				key:		"week",
>+				label:		this._("previous week")
>+			},
>+			{
>+				key:		"month",
>+				label:		this._("previous month")
>+			},
>+			{
>+				key:		"year",
>+				label:		this._("previous year")
>+			}
>+		];
>+
>+		// Build tabs and attach them to page
>+		for (var idx=0; idx<page_setup.length; idx++)
>+		{
>+			var tab = new umc.widgets.Page({
>+				title:			page_setup[idx].label,
>+				headerText:		page_setup[idx].heading,
>+				helpText:		page_setup[idx].desc,
>+				closable:		false
>+				});
>+			this.addChild(tab);
>+
>+			// Title pane without rollup/down
>+			var cont = new umc.widgets.ExpandingTitlePane({
>+				title:			this._("Statistics")
>+			});
>+			tab.addChild(cont);
>+			
>+			// ExpandingTitlePane doesn't honor 'scrollable'
>+			// but we might need it
>+			var scroll = new umc.widgets.ContainerWidget({
>+				scrollable:		true
>+			});
>+			cont.addChild(scroll);
>+			
>+			// three-column grid layout
>+			var grid = new dojox.layout.TableContainer({
>+				cols: 3
>+			});
>+			scroll.addChild(grid);
>+			for (var i=0; i<tab_setup.length; i++)
>+			{
>+				grid.addChild(new dijit.layout.ContentPane({
>+					content: 	dojox.string.sprintf(
>+									"<h1 style='white-space:nowrap;'>%s: %s<h1>",
>+									this._("Period"),
>+									tab_setup[i].label)
>+				}));
>+				grid.addChild(new dijit.layout.ContentPane({
>+					content:	dojox.string.sprintf(
>+									"<img src='/statistik/ucs_%s-%s.png'>",
>+									page_setup[idx].key,
>+									tab_setup[i].key)
>+				}));
>+				// third column used as spacer
>+				grid.addChild(new dijit.layout.ContentPane({
>+					content:	'&nbsp;'
>+				}));
>+			}
>+		}
>+	}	
>+});
>Index: umc/js/de.po
>===================================================================
>--- umc/js/de.po	(revision 0)
>+++ umc/js/de.po	(revision 0)
>@@ -0,0 +1,88 @@
>+# This file is auto-generated by the dh-umc tools and should not be edited!
>+#, fuzzy
>+msgid ""
>+msgstr ""
>+"Project-Id-Version: univention-management-console-module-mrtg\n"
>+"Report-Msgid-Bugs-To: packages@univention.de\n"
>+"POT-Creation-Date: 2011-08-18 08:39+0200\n"
>+"PO-Revision-Date: 2011-08-18 09:15+0200\n"
>+"Last-Translator: Frank Greif <fg@it25.de>\n"
>+"Language-Team: LANGUAGE <LL@li.org>\n"
>+"Language: de\n"
>+"MIME-Version: 1.0\n"
>+"Content-Type: text/plain; charset=UTF-8\n"
>+"Content-Transfer-Encoding: 8bit\n"
>+
>+#: umc/js/mrtg.js:43
>+msgid "Load"
>+msgstr "Last"
>+
>+#: umc/js/mrtg.js:55
>+msgid "Memory"
>+msgstr "Hauptspeicher"
>+
>+#: umc/js/mrtg.js:56
>+msgid "Memory usage"
>+msgstr "Auslastung des Hauptspeichers"
>+
>+#: umc/js/mrtg.js:51
>+msgid "Number of active terminal server sessions"
>+msgstr "Anzahl der aktiven Terminalserver Sitzungen"
>+
>+#: umc/js/mrtg.js:120
>+msgid "Period"
>+msgstr "Zeitraum"
>+
>+#: umc/js/mrtg.js:49
>+msgid "Sessions"
>+msgstr "Sitzungen"
>+
>+#: umc/js/mrtg.js:99
>+msgid "Statistics"
>+msgstr "Statistiken"
>+
>+#: umc/js/mrtg.js:61
>+msgid "Swap"
>+msgstr "Swap"
>+
>+#: umc/js/mrtg.js:62
>+msgid "Swap space"
>+msgstr "Auslagerungsspeicher"
>+
>+#: umc/js/mrtg.js:44
>+#, fuzzy
>+msgid "System load"
>+msgstr "Systemauslastung"
>+
>+#: umc/js/mrtg.js:45
>+#, fuzzy
>+msgid "System load in percent"
>+msgstr "Systemauslastung in Prozent"
>+
>+#: umc/js/mrtg.js:50
>+msgid "Terminal server sessions"
>+msgstr "Terminalserver Sitzungen"
>+
>+#: umc/js/mrtg.js:63
>+msgid "Utilization of swap space in percent"
>+msgstr "Auslastung des Auslagerungsspeichers in Prozent"
>+
>+#: umc/js/mrtg.js:57
>+msgid "Utilization of system memory in percent"
>+msgstr "Auslastung des Hauptspeichers in Prozent"
>+
>+#: umc/js/mrtg.js:72
>+msgid "previous day"
>+msgstr "vergangener Tag"
>+
>+#: umc/js/mrtg.js:80
>+msgid "previous month"
>+msgstr "vergangener Monat"
>+
>+#: umc/js/mrtg.js:76
>+msgid "previous week"
>+msgstr "vergangene Woche"
>+
>+#: umc/js/mrtg.js:84
>+msgid "previous year"
>+msgstr "vergangenes Jahr"
>Index: 35univention-management-console-module-mrtg.inst
>===================================================================
>--- 35univention-management-console-module-mrtg.inst	(revision 0)
>+++ 35univention-management-console-module-mrtg.inst	(revision 0)
>@@ -0,0 +1,50 @@
>+#!/bin/sh
>+# -*- coding: utf-8 -*-
>+#
>+# Univention Management Console Module mrtg
>+#  join script
>+#
>+# Copyright 2011 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+
>+VERSION=1
>+
>+. /usr/share/univention-join/joinscripthelper.lib
>+. /usr/share/univention-lib/umc.sh
>+
>+joinscript_init
>+
>+umc_init
>+umc_operation_create "mrtg" "Mrtg" "mrtg/*"
>+umc_acl_create "mrtg-all" "Mrtg" "All operations" "mrtg/*"
>+umc_policy_append "default-admin" "mrtg-all"
>+
>+joinscript_save_current_version
>+
>+exit 0
>+
>+

Actions: View | Diff

Attachments on bug 22894: 3451 | 3452