diff --git a/plugins/system/irq b/plugins/system/irq index 6949bea1..8b4bb67e 100755 --- a/plugins/system/irq +++ b/plugins/system/irq @@ -343,10 +343,10 @@ sub prepare_graphs my $field_name = clean_fieldname(sprintf("irq_%s", $irq_name)); append_cpu_limit($limits, $gr, $irq_type, $field_name, $graph_name, $i, $irq_name); $gr->{$graph_name}{'graph'}{'order'} .= ' '.$field_name; - for my $fo (qw(label info)) + for my $this_field (qw(label info)) { - $gr->{$graph_name}{'fields'}{$field_name}{$fo} = replace($fields->{'irq'}{$fo}, ':irq:', $irq_name); - $gr->{$graph_name}{'fields'}{$field_name}{$fo} = replace($gr->{$graph_name}{'fields'}{$field_name}{$fo}, + $gr->{$graph_name}{'fields'}{$field_name}{$this_field} = replace($fields->{'irq'}{$this_field}, ':irq:', $irq_name); + $gr->{$graph_name}{'fields'}{$field_name}{$this_field} = replace($gr->{$graph_name}{'fields'}{$field_name}{$this_field}, ':irqinfo:', exists($IRQi->{'description'}{$irq_type}{$irq_name}) ? $IRQi->{'description'}{$irq_type}{$irq_name} : @@ -368,7 +368,7 @@ sub print_config { printf("multigraph %s\n", $g); for my $go (sort keys %{$config->{$g}{'graph'}}) { printf("graph_%s %s\n", $go, $config->{$g}{'graph'}{$go}); } - for my $f (sort keys %{$config->{$g}{'fields'}}) { for my $fo (sort keys %{$config->{$g}{'fields'}{$f}}) { printf("%s.%s %s\n", $f, $fo, $config->{$g}{'fields'}{$f}{$fo}); } } + for my $f (sort keys %{$config->{$g}{'fields'}}) { for my $this_field (sort keys %{$config->{$g}{'fields'}{$f}}) { printf("%s.%s %s\n", $f, $this_field, $config->{$g}{'fields'}{$f}{$this_field}); } } print "\n"; } }