debian/0000755000000000000000000000000011761123761007173 5ustar debian/rules0000755000000000000000000000042211761123514010245 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_MAVEN_INSTALL_TO_USJ := false get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename debian/README.source0000644000000000000000000000047411761123514011353 0ustar Information about jenkins-memory-monitor ---------------------------------------- This package was debianized using the mh_make command from the maven-debian-helper package. The build system uses Maven but prevents it from downloading anything from the Internet, making the build compliant with the Debian policy. debian/maven.rules0000644000000000000000000000160411761123514011352 0ustar # Maven rules - transform Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # - a regular expression of the form s/match/replace/ # in this case, elements that match are transformed using # the regex rule. # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ junit junit jar s/3\..*/3.x/ * * debian/control0000644000000000000000000000310311761123514010567 0ustar Source: jenkins-memory-monitor Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: James Page DM-Upload-Allowed: yes Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper, procps Build-Depends-Indep: default-jdk-doc, junit, libjna-java, libjna-java-doc, libmaven-compiler-plugin-java, libmaven-javadoc-plugin-java Standards-Version: 3.9.3 Homepage: https://github.com/jenkinsci/extras-memory-monitor Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-memory-monitor.git Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-memory-monitor.git Package: jenkins-memory-monitor Architecture: all Depends: ${maven:Depends}, ${misc:Depends} Recommends: ${maven:OptionalDepends} Description: Jenkins native integration for monitoring memory usage. This library provides native integration for monitoring memory and swap usage from within Java code. It is used by the Jenkins CI application to monitor these statistics on Jenkins master and slave nodes. Package: jenkins-memory-monitor-doc Architecture: all Section: doc Depends: ${maven:DocDepends}, ${misc:Depends} Recommends: ${maven:DocOptionalDepends} Suggests: jenkins-memory-monitor Description: Documentation for jenkins-memory-monitor. This library provides native integration for monitoring memory and swap usage from within Java code. It is used by the Jenkins CI application to monitor these statistics on Jenkins master and slave nodes. . This package provides the API documentation for jenkins-memory-monitor. debian/copyright0000644000000000000000000000305011761123514011120 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Jenkins Memory Monitor Source: http://jenkins-ci.org Comment: Licensing for this package is MIT as identified in the pom.xml file in the root of the upstream source code. Bug has been raised upstream to get headers added to .java files as well. Files: * Copyright: 2011, Contributors of the Jenkins project License: MIT Files: debian/* Copyright: 2011, Canonical Ltd. (http://www.canonical.com/) License: MIT License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/jenkins-memory-monitor-doc.install0000644000000000000000000000007211761123514015755 0ustar target/apidocs/* usr/share/doc/jenkins-memory-monitor/api debian/maven.ignoreRules0000644000000000000000000000145511761123514012522 0ustar # Maven ignore rules - ignore some Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM # junit junit jar s/3\\..*/3.x/ org.apache.maven.plugins maven-assembly-plugin * * * * debian/maven.properties0000644000000000000000000000035111761123514012412 0ustar # Include here properties to pass to Maven during the build. # For example: # maven.test.skip=true # Specify code source and target as not explicit in pom.xml # and defaults to 1.3 maven.compiler.source=1.5 maven.compiler.target=1.5 debian/jenkins-memory-monitor-doc.doc-base.api0000644000000000000000000000052011761123514016532 0ustar Document: jenkins-memory-monitor Title: API Javadoc for Jenkins Memory Monitor Author: Jenkins Developers Abstract: This is the API Javadoc provided for the jenkins-memory-monitor library. Section: Programming Format: HTML Index: /usr/share/doc/jenkins-memory-monitor/api/index.html Files: /usr/share/doc/jenkins-memory-monitor/api/* debian/watch0000644000000000000000000000023311761123514010216 0ustar version=3 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ http://githubredir.debian.net/github/jenkinsci/extras-memory-monitor/ memory-monitor-(.*).tar.gz debian/changelog0000644000000000000000000000224011761123514011037 0ustar jenkins-memory-monitor (1.7-2) unstable; urgency=low [ tony mancill ] * Address typos in package description in d/control (Closes: #661980). - Thanks to Paul Menzel. * Bump Standards-Version to 3.9.3 (no changes). * Update Format: specifier in d/copyright. [ James Page ] * Fix FTBFS with procps 3.3.3 (Closes: #674389): - d/patches/propc-3.3.patch: Refreshed to accommodate new output format of top command. -- James Page Tue, 29 May 2012 11:38:14 +0100 jenkins-memory-monitor (1.7-1) unstable; urgency=low * New upstream release. * debian/patches/propc-3.3.patch: Fix parsing of top output for procps >= 3.3 (Closes: #652242). [tony mancill] * Set DMUA flag. * Tweak d/copyright for DEP5 field name changes. -- James Page Tue, 21 Feb 2012 11:51:22 +0000 jenkins-memory-monitor (1.5-1) unstable; urgency=low * Initial Debian release (Closes: #634630) -- James Page Mon, 01 Aug 2011 09:44:58 +0100 jenkins-memory-monitor (1.5-0ubuntu1) oneiric; urgency=low * Initial release -- James Page Wed, 22 Jun 2011 10:39:57 +0100 debian/jenkins-memory-monitor.poms0000644000000000000000000000222211761123514014521 0ustar # List of POM files for the package # Format of this file is: # [option]* # where option can be: # --ignore: ignore this POM or # --no-parent: remove the tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact # --has-package-version: to indicate that the original version of the POM is the same as the upstream part # of the version for the package. # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: path to the build artifact associated with this POM, # it will be installed when using the command mh_install # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=: name to use when installing the library in /usr/share/java # --usj-version=: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java # --dest-jar=: the destination for the real jar # pom.xml --no-parent debian/jenkins-memory-monitor.lintian-overrides0000644000000000000000000000025011761123514017200 0ustar # This is a private library; Jenkins does its own dep resolution # so this warning can be safely overriden jenkins-memory-monitor binary: missing-classpath libjna-java debian/compat0000644000000000000000000000000211761123514010365 0ustar 7 debian/maven.cleanIgnoreRules0000644000000000000000000000145511761123514013465 0ustar # Maven ignore rules - ignore some Maven dependencies and plugins # Format of this file is: # [group] [artifact] [type] [version] [classifier] [scope] # where each element can be either # - the exact string, for example org.apache for the group, or 3.1 # for the version. In this case, the element is simply matched # and left as it is # - * (the star character, alone). In this case, anything will # match and be left as it is. For example, using * on the # position of the artifact field will match any artifact id # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM # junit junit jar s/3\\..*/3.x/ org.apache.maven.plugins maven-assembly-plugin * * * * debian/source/0000755000000000000000000000000011761123514010467 5ustar debian/source/format0000644000000000000000000000001411761123514011675 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000011761123514010616 5ustar debian/patches/procps-3.3.patch0000644000000000000000000001042411761123514013447 0ustar Author: James Page Description: [PATCH] Updates to deal with procps >= 3.3 as present in Debian unstable Origin: https://github.com/javacruft/extras-memory-monitor/commit/7ba8e783a9936a3b59abd840f516c741ee9ea3b9 Forwarded: yes Index: jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java =================================================================== --- jenkins-memory-monitor.orig/src/main/java/org/jvnet/hudson/Top.java 2012-02-21 11:51:10.427331352 +0000 +++ jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java 2012-05-29 11:28:29.586027313 +0100 @@ -109,7 +109,13 @@ try { Matcher m = p.matcher(line); if(m.find()) { - values[i] = parse(m.group(1)); + if (m.groupCount() == 2) { + // Deal with later versions of procps + // which split KMG from values + values[i] = parse(m.group(2) + m.group(1)); + } else { + values[i] = parse(m.group(1)); + } continue OUTER; } } catch (NumberFormatException e) { @@ -161,6 +167,31 @@ 6907 kohsuke 20 0 134m 14m 9184 S 2 0.4 0:51.56 metacity +On Debian Sid 29/05/2012 +==================================== +Linux hendrix 3.2.0-24-generic #39-Ubuntu SMP Mon May 21 16:52:17 UTC 2012 x86_64 GNU/Linux +/usr/bin/top +top - 11:24:47 up 2:43, 0 users, load average: 0.13, 0.52, 0.77 +Tasks: 224 total, 2 running, 221 sleeping, 0 stopped, 1 zombie +%Cpu(s): 1.5 us, 9.4 sy, 0.0 ni, 89.0 id, 0.1 wa, 0.0 hi, 0.0 si, 0.0 st +KiB Mem: 3980564 total, 2757216 used, 1223348 free, 193496 buffers +KiB Swap: 4124668 total, 256 used, 4124412 free, 1004884 cached + + PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND + 1607 root 20 0 494m 140m 115m S 18.3 3.6 3:54.94 Xorg + 3452 jamespag 20 0 1431m 563m 42m S 12.2 14.5 1:11.48 thunderbird-bin +26657 jamespag 20 0 23616 1540 1096 R 12.2 0.0 0:00.02 top + +MEMORY Usage +This portion consists of two lines which may express values in kilobytes (Kb), megabytes (Mb) +or gigabytes (Gb) depending on the amount of currently +installed physical memory. + +Line 1 reflects physical memory, classified as: + total, used, free, buffers + +Line 2 reflects virtual memory, classified as: + total, used, free, cached From http://www.unixtop.org/about.shtml ======================================= @@ -260,25 +291,29 @@ new Pattern[] { Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) phys mem"), // Sol10+blastwave Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) total"), // Linux + Pattern.compile("^([kmg])(?:i)?b mem(?:ory)?:.* ([0-9.]+) total"), // Linux procps (>= 3.3) Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) real") // unixtop.org }, // available phys. memory new Pattern[] { Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) free"), + Pattern.compile("^([kmg])(?:i)?b mem(?:ory)?:.* ([0-9.]+) free"), // Linux procps (>= 3.3) Pattern.compile("^physmem:.* ([0-9.]+[kmgb]) free") // Mac OS X }, // total swap memory new Pattern[] { Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) swap,"), // Sol10+blastwave - Pattern.compile("^swap:.* ([0-9.]+[kmgb]) total") // Linux + Pattern.compile("^swap:.* ([0-9.]+[kmgb]) total"), // Linux + Pattern.compile("^([kmg])(?:i)?b swap:.* ([0-9.]+) total") // Linux procps (>= 3.3) }, // available swap memory new Pattern[] { Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) free swap"), // Sol10+blastwave Pattern.compile("^swap:.* ([0-9.]+[kmb]) free"), // Linux + Pattern.compile("^([kmg])(?:i)?b swap:.* ([0-9.]+) free"), // Linux procps (>= 3.3) Pattern.compile("^swap:\\w* (?:[0-9.]+[kmb])\\w* \\+ \\w*([0-9.]+[kmb]) free"), // Mac OS Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) swap free") // unixtop }, debian/patches/series0000644000000000000000000000002111761123514012024 0ustar procps-3.3.patch