v0.5.7 - service-smf-fix

sonnens · Jan 27, 2014 · 3cf2c9a · 3cf2c9a
2 parents dba38a1 + ef427ef
commit 3cf2c9a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.5.7
+
+* collectors/service - smf parsing fix
+
 # 0.5.6
 
 * collectors/service - docs update

diff --git a/collectors/service/fakebin/solaris/svcs b/collectors/service/fakebin/solaris/svcs
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+cat << ENDING
+svc:/system/auditset:default (Set non-/attributable audit flags
+                                in the kernel context.)
+ State: online since January 26, 2014 03:31:36 PM UTC
+   See: /etc/svc/volatile/system-auditset:default.log
+Impact: None.
+ENDING
diff --git a/collectors/service/service b/collectors/service/service
@@ -55,6 +55,7 @@ handler = {
         map {|svc|
           info = svc.match(%r{
             \A(?<fmri>\S+)\s.*?\n
+            (?:\s+.*?\)\n)?
             \s+State:\s+(?<state>\S+)\s+
               since\s+(?<date>.*?)\n
           }x) or raise "cannot parse #{svc}"

diff --git a/lib/panoptimon/version.rb b/lib/panoptimon/version.rb
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2014 Cisco, Inc.
 
 module Panoptimon
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end