nagios_webbed_log 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/nagios_logger.rb

@@ -1,4 +1,27 @@
+#coding: UTF-8
 module NagiosLogger
+=begin
+CPU on remaccess	 Рабочий сервер
+CPU on ra	 Тестовый сервер
+HTTP	 УРМ
+HTTP-work	 СОД
+HTTP-lesson	 Тестовый СОД
+Соответствие уровней оповещений в логе выводимым в таблице:
+
+CRITICAL	 Ошибка
+WARNING	 Предупреждение
+=end
+ SERVICE_LUT = {
+  "CPU on ra" => "Тестовый сервер",
+  "CPU on remaccess" => "Рабочий сервер",
+  "HTTP" => "УРМ",
+  "HTTP-work" => "СОД",
+  "HTTP-lesson" => "Тестовый СОД"
+ }
+ LEVEL_LUT = {
+  "CRITICAL" => "Ошибка",
+  "WARNING" => "Предупреждение"
+ }
  def load_file_list(pref)
   Dir[File.join(pref, "*")].map{|n| File.basename(n) }
  end
@@ -57,7 +80,9 @@ module NagiosLogger
     data[:count] = n[4]
     data[:message] = n[5]
    end
+   return nil unless SERVICE_LUT.has_key?(data[:service])
   end
+  data[:service] = SERVICE_LUT[data[:service]]
   data
  end
 

data/lib/views/index.haml

@@ -7,40 +7,43 @@
   %label{:for => :year} Year
   %select#year{:name => "year"}
    %option{:value => '0'} ---
-   - @years.each do |year|
+   - @years.sort.each do |year|
     %option{:value => year, :selected => (year == @year)}= year
 
   %label{:for => :month} Month
   %select#year{:name => "month"}
    %option{:value => '0'} ---
-   - @months.each do |month|
+   - @months.sort.each do |month|
     %option{:value => month, :selected => (month == @month)}= month
 
   %label{:for => :day} Day
   %select#day{:name => "day"}
    %option{:value => '0'} ---
-   - @days.each do |day|
+   - @days.sort.each do |day|
     %option{:value => day, :selected => (day == @day)}= day
   %button{:name => "submit"} find
 
- %table
-  %tr
-   %th Date
-   %th Start-time
-   %th Stop-time
-   %th Service
-   %th Reason
-   %th Comments
-  - @events.each do |evt|
-   -# lvl = evt.map{|it| levs.index(it[:level]) || 3 }.max
-   -# ll = evt.detect{|it| not levs.include?(it[:level]) }
-   -# len = evt.last[:stamp] - evt.first[:stamp]
-   -# puts "#{its.first[:host]}\t#{its.first[:service]}\t#{its.first[:stamp].to_i}\t#{its.first[:stamp].strftime("%Y-%m-%d %H:%M:%S")}\t#{levs[lvl]}\t#{len}\t#{its.first[:message]}"
+ - unless @events.empty?
+  %a{:href => "/#{@year == '0' ? 0 : @year}/#{@month == '0' ? 0 : @month}/#{@day == '0' ? 0 : @day}.csv"} Save to CSV
+  %table
    %tr
-    %td= evt.first[:stamp].strftime("%Y-%m-%d")
-    %td= evt.first[:stamp].strftime("%H:%M:%S")
-    %td= evt.last[:stamp].strftime("%H:%M:%S")
-    %td #{evt.first[:host]}-#{evt.first[:service]}
-    %td #{evt.first[:message]}
-    %td
+    %th Date
+    %th Start-time
+    %th Lattency
+    %th Service
+    %th Level
+    %th{:style => "display:none;"} Reason
+   - levs = %w(OK WARNING CRITICAL UNKNOWN)
+   - @events.each do |evt|
+    - lvl = evt.map{|it| levs.index(it[:level]) || 3 }.max
+    - ll = evt.detect{|it| not levs.include?(it[:level]) }
+    -# len = evt.last[:stamp] - evt.first[:stamp]
+    -# puts "#{its.first[:host]}\t#{its.first[:service]}\t#{its.first[:stamp].to_i}\t#{its.first[:stamp].strftime("%Y-%m-%d %H:%M:%S")}\t#{levs[lvl]}\t#{len}\t#{its.first[:message]}"
+    %tr
+     %td= evt.first[:stamp].strftime("%Y-%m-%d")
+     %td= evt.first[:stamp].strftime("%H:%M:%S")
+     %td= evt.last[:stamp] - evt.first[:stamp]
+     %td #{evt.first[:service]}
+     %td= NagiosLogger::LEVEL_LUT[lvl] || "---"
+     %td{:style => "display:none;"} #{evt.first[:message]}
 

data/nagios_webbed_log.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nagios_webbed_log"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["afa"]
-  s.date = "2012-10-08"
+  s.date = "2012-10-09"
   s.description = "simple nagios log publisher"
   s.email = "afa.alone@gmail.com"
   s.executables = ["nagios_webbed_log"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios_webbed_log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -341,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -6858435
+      hash: -497093201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: