[icinga-checkins] icinga.org: icinga-reports/mluebben/default: Cleanup directory structure

git at icinga.org git at icinga.org
Wed Aug 17 17:23:58 CEST 2011


Module: icinga-reports
Branch: mluebben/default
Commit: f107f8f2ff0821ce3e4f6fd83f377a2c6ef0ef31
URL:    https://git.icinga.org/?p=icinga-reports.git;a=commit;h=f107f8f2ff0821ce3e4f6fd83f377a2c6ef0ef31

Author: Michael Lübben <michael_luebben at web.de>
Date:   Wed Aug 17 17:23:26 2011 +0200

Cleanup directory structure

---

 .../bin}/importAvailReport.pl                      |    2 +-
 .../{ => icinga-reporting}/etc/default.ini         |    2 +-
 .../modules}/Config/Configuration.pm               |    4 ++--
 .../modules}/Database/DBHandler.pm                 |    0 
 .../modules}/Debug/Debugger.pm                     |    0 
 .../modules}/Parser/Availability.pm                |    0 
 ...rt.main.service.detailed.availability.jrxml.pdf |  Bin 101514 -> 101514 bytes
 .../packages}/icinga_availability_main_report.zip  |  Bin 8506 -> 8506 bytes
 .../packages}/icinga_availability_sub_report.zip   |  Bin 16523 -> 16523 bytes
 .../main/detailedAvailabilityReport.jrxml          |    0 
 .../main/detailedAvailabilityReport_example1.jrxml |    0 
 .../templates}/sub/other/logentries.jrxml          |    0 
 .../sub/service/allStateBreakdowns.jrxml           |    0 
 .../templates}/sub/service/piechartStates.jrxml    |    0 
 .../templates}/sub/service/stateBreakdown.jrxml    |    0 
 .../templates}/sub/service/summaryState.jrxml      |    0 
 16 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AvailReportParser/importAvailReport.pl b/AvailReportParser/icinga-reporting/bin/importAvailReport.pl
similarity index 99%
rename from AvailReportParser/importAvailReport.pl
rename to AvailReportParser/icinga-reporting/bin/importAvailReport.pl
index a5cf0e2..2713d9e 100755
--- a/AvailReportParser/importAvailReport.pl
+++ b/AvailReportParser/icinga-reporting/bin/importAvailReport.pl
@@ -103,7 +103,7 @@ use strict;
 use LWP 5.64;
 use Getopt::Long;
 use FindBin;
-use lib "$FindBin::Bin/Modules";
+use lib "$FindBin::Bin/../modules";
 use Parser::Availability;
 use Database::DBHandler;
 use Config::Configuration;
diff --git a/AvailReportParser/etc/default.ini b/AvailReportParser/icinga-reporting/etc/default.ini
similarity index 94%
rename from AvailReportParser/etc/default.ini
rename to AvailReportParser/icinga-reporting/etc/default.ini
index fab5b72..c2b1eb8 100755
--- a/AvailReportParser/etc/default.ini
+++ b/AvailReportParser/icinga-reporting/etc/default.ini
@@ -49,4 +49,4 @@ DEBUG = 0
 LOGLEVEL = 1
 
 # Path to debug file
-DEBUGFILE = /tmp/report_avail.log
+DEBUGFILE = ../var/log/default_report_avail.log
diff --git a/AvailReportParser/Modules/Config/Configuration.pm b/AvailReportParser/icinga-reporting/modules/Config/Configuration.pm
similarity index 94%
rename from AvailReportParser/Modules/Config/Configuration.pm
rename to AvailReportParser/icinga-reporting/modules/Config/Configuration.pm
index 2ba4cce..1c97c69 100755
--- a/AvailReportParser/Modules/Config/Configuration.pm
+++ b/AvailReportParser/icinga-reporting/modules/Config/Configuration.pm
@@ -11,7 +11,7 @@ Configuration.pm
 
 =head1 Version
 
-Version 0.01
+Version 0.0.2
 
 =head1 DESCRIPTION
 
@@ -68,7 +68,7 @@ sub new {
 sub readConfigFile {
 	my $self = shift;
 
-	open(CONFIGFILE, "<etc/$self->{configFileName}") || die "Config file etc/".$self->{configFileName}." not found!\n";
+	open(CONFIGFILE, "<../etc/$self->{configFileName}") || die "Config file etc/".$self->{configFileName}." not found!\n";
 		while (<CONFIGFILE>) {
 		    chomp;                  # no newline
 		    s/#.*//;                # no comments
diff --git a/AvailReportParser/Modules/Database/DBHandler.pm b/AvailReportParser/icinga-reporting/modules/Database/DBHandler.pm
similarity index 100%
rename from AvailReportParser/Modules/Database/DBHandler.pm
rename to AvailReportParser/icinga-reporting/modules/Database/DBHandler.pm
diff --git a/AvailReportParser/Modules/Debug/Debugger.pm b/AvailReportParser/icinga-reporting/modules/Debug/Debugger.pm
similarity index 100%
rename from AvailReportParser/Modules/Debug/Debugger.pm
rename to AvailReportParser/icinga-reporting/modules/Debug/Debugger.pm
diff --git a/AvailReportParser/Modules/Parser/Availability.pm b/AvailReportParser/icinga-reporting/modules/Parser/Availability.pm
similarity index 100%
rename from AvailReportParser/Modules/Parser/Availability.pm
rename to AvailReportParser/icinga-reporting/modules/Parser/Availability.pm
diff --git a/AvailReportParser/JasperReports/Examples/icinga.report.main.service.detailed.availability.jrxml.pdf b/AvailReportParser/jasperreports/examples/icinga.report.main.service.detailed.availability.jrxml.pdf
similarity index 100%
rename from AvailReportParser/JasperReports/Examples/icinga.report.main.service.detailed.availability.jrxml.pdf
rename to AvailReportParser/jasperreports/examples/icinga.report.main.service.detailed.availability.jrxml.pdf
diff --git a/AvailReportParser/JasperReports/Packages/icinga_availability_main_report.zip b/AvailReportParser/jasperreports/packages/icinga_availability_main_report.zip
similarity index 100%
rename from AvailReportParser/JasperReports/Packages/icinga_availability_main_report.zip
rename to AvailReportParser/jasperreports/packages/icinga_availability_main_report.zip
diff --git a/AvailReportParser/JasperReports/Packages/icinga_availability_sub_report.zip b/AvailReportParser/jasperreports/packages/icinga_availability_sub_report.zip
similarity index 100%
rename from AvailReportParser/JasperReports/Packages/icinga_availability_sub_report.zip
rename to AvailReportParser/jasperreports/packages/icinga_availability_sub_report.zip
diff --git a/AvailReportParser/JasperReports/Templates/main/detailedAvailabilityReport.jrxml b/AvailReportParser/jasperreports/templates/main/detailedAvailabilityReport.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/main/detailedAvailabilityReport.jrxml
rename to AvailReportParser/jasperreports/templates/main/detailedAvailabilityReport.jrxml
diff --git a/AvailReportParser/JasperReports/Templates/main/detailedAvailabilityReport_example1.jrxml b/AvailReportParser/jasperreports/templates/main/detailedAvailabilityReport_example1.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/main/detailedAvailabilityReport_example1.jrxml
rename to AvailReportParser/jasperreports/templates/main/detailedAvailabilityReport_example1.jrxml
diff --git a/AvailReportParser/JasperReports/Templates/sub/other/logentries.jrxml b/AvailReportParser/jasperreports/templates/sub/other/logentries.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/sub/other/logentries.jrxml
rename to AvailReportParser/jasperreports/templates/sub/other/logentries.jrxml
diff --git a/AvailReportParser/JasperReports/Templates/sub/service/allStateBreakdowns.jrxml b/AvailReportParser/jasperreports/templates/sub/service/allStateBreakdowns.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/sub/service/allStateBreakdowns.jrxml
rename to AvailReportParser/jasperreports/templates/sub/service/allStateBreakdowns.jrxml
diff --git a/AvailReportParser/JasperReports/Templates/sub/service/piechartStates.jrxml b/AvailReportParser/jasperreports/templates/sub/service/piechartStates.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/sub/service/piechartStates.jrxml
rename to AvailReportParser/jasperreports/templates/sub/service/piechartStates.jrxml
diff --git a/AvailReportParser/JasperReports/Templates/sub/service/stateBreakdown.jrxml b/AvailReportParser/jasperreports/templates/sub/service/stateBreakdown.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/sub/service/stateBreakdown.jrxml
rename to AvailReportParser/jasperreports/templates/sub/service/stateBreakdown.jrxml
diff --git a/AvailReportParser/JasperReports/Templates/sub/service/summaryState.jrxml b/AvailReportParser/jasperreports/templates/sub/service/summaryState.jrxml
similarity index 100%
rename from AvailReportParser/JasperReports/Templates/sub/service/summaryState.jrxml
rename to AvailReportParser/jasperreports/templates/sub/service/summaryState.jrxml





More information about the icinga-checkins mailing list