diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-06-04 15:18:20 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-06-04 15:18:20 -0500 |
| commit | 94c51e20ceeb2c127dbfa9d6befa69a2faa54b0a (patch) | |
| tree | 1a5b383bb45d8d0d602ff2d754cac35e97a974fa | |
| parent | db56ef598b45f4310b74ffd2a3e151649a05e509 (diff) | |
| download | bcfg2-94c51e20ceeb2c127dbfa9d6befa69a2faa54b0a.tar.gz bcfg2-94c51e20ceeb2c127dbfa9d6befa69a2faa54b0a.tar.bz2 bcfg2-94c51e20ceeb2c127dbfa9d6befa69a2faa54b0a.zip | |
Admin reports: Stop handling ping data
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Reports.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py index b455f443e..6978e4ce8 100644 --- a/src/lib/Bcfg2/Server/Admin/Reports.py +++ b/src/lib/Bcfg2/Server/Admin/Reports.py @@ -41,7 +41,7 @@ from django.db import connection, transaction from Bcfg2.Server.Reports.reports.models import Client, Interaction, Entries, \ Entries_interactions, Performance, \ - Reason, Ping + Reason def printStats(fn): @@ -55,7 +55,6 @@ def printStats(fn): start_i = Interaction.objects.count() start_ei = Entries_interactions.objects.count() start_perf = Performance.objects.count() - start_ping = Ping.objects.count() fn(self, *data) @@ -67,8 +66,6 @@ def printStats(fn): (start_ei - Entries_interactions.objects.count())) self.log.info("Metrics removed: %s" % (start_perf - Performance.objects.count())) - self.log.info("Ping metrics removed: %s" % - (start_ping - Ping.objects.count())) return print_stats @@ -301,12 +298,6 @@ class Reports(Bcfg2.Server.Admin.Mode): self.log.debug("Filtering by maxdate: %s" % maxdate) ipurge = ipurge.filter(timestamp__lt=maxdate) - # Handle ping data as well - ping = Ping.objects.filter(endtime__lt=maxdate) - if client: - ping = ping.filter(client=cobj) - ping.delete() - if state: filtered = True if state not in ('dirty', 'clean', 'modified'): |