From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A26661381F3 for ; Thu, 15 Aug 2013 09:19:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F65FE0B5D; Thu, 15 Aug 2013 09:19:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B2E7E0B5D for ; Thu, 15 Aug 2013 09:19:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A67A433EBC5 for ; Thu, 15 Aug 2013 09:19:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DEE65E545D for ; Thu, 15 Aug 2013 09:18:57 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1376558242.e469805008ebc3743087694844d319e862f0803d.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/stats/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/stats/dbcollector.py roverlay/stats/rrd.py X-VCS-Directories: roverlay/stats/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: e469805008ebc3743087694844d319e862f0803d X-VCS-Branch: master Date: Thu, 15 Aug 2013 09:18:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ad422f84-b3ca-4051-9594-7e0978de87dd X-Archives-Hash: 89115348048ba3c22c2a9479ed19b9ff commit: e469805008ebc3743087694844d319e862f0803d Author: André Erdmann mailerd de> AuthorDate: Thu Aug 15 09:17:22 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Aug 15 09:17:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e4698050 roverlay/stats/rrd: use GAUGE for numstats --- roverlay/stats/dbcollector.py | 2 ++ roverlay/stats/rrd.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roverlay/stats/dbcollector.py b/roverlay/stats/dbcollector.py index 402e64d..a9169e6 100644 --- a/roverlay/stats/dbcollector.py +++ b/roverlay/stats/dbcollector.py @@ -41,6 +41,8 @@ class StatsDBCollector ( object ): ov_create = stats.overlay_creation ov = stats.overlay + # note that the int() casts are necessary here + # return self.__class__.NUMSTATS ( pc_repo = int ( stats.repo.pkg_count ), pc_distmap = int ( stats.distmap.pkg_count ), diff --git a/roverlay/stats/rrd.py b/roverlay/stats/rrd.py index ffccbe1..2a09bdd 100644 --- a/roverlay/stats/rrd.py +++ b/roverlay/stats/rrd.py @@ -43,14 +43,15 @@ class StatsDB ( roverlay.db.rrdtool.RRD ): def make_vars ( self ): heartbeat = 2 * self.step return tuple ( - RRDVariable ( k, 'DERIVE', val_min=0, heartbeat=heartbeat ) + RRDVariable ( k, 'GAUGE', val_min=0, heartbeat=heartbeat ) for k in self.collector.NUMSTATS_KEYS ) # --- end of make_vars (...) --- def make_rra ( self ): return ( - RRDArchive.new_day ( 'LAST', 0.7, step=self.step ), + #RRDArchive.new_day ( 'MIN', 0.7, step=self.step ), + RRDArchive.new_day ( 'MAX', 0.7, step=self.step ), RRDArchive.new_week ( 'AVERAGE', 0.7, step=self.step ), RRDArchive.new_month ( 'AVERAGE', 0.7, step=self.step ), )