Changeset 3342

Timestamp:

02/06/10 21:37:26 (6 months ago)

Author:

steve.schnepp

Message:

- custom format for graph_data_size
- per field & plugin graph_data_size

Files:

• people/snide/pre_1.5/master/lib/Munin/Master/UpdateWorker.pm (modified) (5 diffs)

people/snide/pre_1.5/master/lib/Munin/Master/UpdateWorker.pm

@@ -400 +400 @@
-        for my $ds_name (keys %{$service_config}) {
-            $self->_set_rrd_data_source_defaults($service_config->{$ds_name});
-
-
+
+
+
-                ERROR "[ERROR] Unable to update $service on $nodedesignation -> $ds_name: Missing data source configuration attribute: label";
-                next;
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-            if (defined($service_data) and defined($service_data->{$ds_name})) {
@@ -469 +478 @@
-                                $file);
-        
-Made 
+
-
-    return $file;
@@ -485 +494 @@
-                $ds_config->{type}, $ds_config->{min}, $ds_config->{max}),
-    );
-
-
+
+
+
-    if ($resolution eq 'normal') {
-        push (@args,
@@ -507 +517 @@
-              "RRA:MIN:0.5:1:115200",
-              "RRA:MAX:0.5:1:115200"); 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    RRDs::create @args;
-    if (my $ERROR = RRDs::error) {
@@ -514 +537 @@
-}
-
+sub parse_custom_resolution {
+        my @elems = split(',\s*', shift);
+        my $update_rate = shift;
+
+        DEBUG "[DEBUG] update_rate: $update_rate";
+
+        my @computer_format;
+        foreach my $elem (@elems) {
+                if ($elem =~ m/(\d+) (\d+)/) {
+                        # nothing to do, already in computer format
+                        push @computer_format, [$1, $2];
+                } elsif ($elem =~ m/(\w+) for (\w+)/) {
+                        my $nb_sec = to_sec($1);
+                        my $for_sec = to_sec($2);
+                        
+                        my $multiplier = int ($nb_sec / $update_rate);
+                        my $multiplier_nb = int ($for_sec / $nb_sec);
+
+                        DEBUG "[DEBUG] $elem"
+                                . " -> nb_sec:$nb_sec, for_sec:$for_sec"
+                                . " -> multiplier:$multiplier, multiplier_nb:$multiplier_nb"
+                        ;
+                        push @computer_format, [$multiplier, $multiplier_nb];
+                }
+        }
+
+        return @computer_format;
+}
+
+# return the number of seconds 
+# for the human readable format
+# s : second,  m : minute, h : hour
+# d : day, w : week, t : month, y : year
+sub to_sec {
+        my $secs_table = {
+                "s" => 1,
+                "m" => 60,
+                "h" => 60 * 60,
+                "d" => 60 * 60 * 24,
+                "w" => 60 * 60 * 24 * 7,
+                "t" => 60 * 60 * 24 * 31, # a month always has 31 days
+                "y" => 60 * 60 * 24 * 365, # a year always has 365 days 
+        };
+
+        my ($target) = @_;
+        if ($target =~ m/(\d+)([smhdwty])/i) {
+                return $1 * $secs_table->{$2};  
+        }
+}
+
+sub to_mul {
+        my ($base, $target) = @_;
+        my $target_sec = to_sec($target);
+        if ($target %% $base != 0) {
+                return 0;
+        }
+
+        return round($target / $base); 
+}
+
+sub to_mul_nb {
+        my ($base, $target) = @_;
+        my $target_sec = to_sec($target);
+        if ($target %% $base != 0) {
+                return 0;
+        }
+}
-
-sub _update_rrd_file {