riemann-bacula 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8259d6fb194ccf10cd5acb756a66b2a22e1f310ed75a081f54cadcf8f7e80e99
-  data.tar.gz: 7ea103923b9966074450861224946190f52cdabc766f0dcb2a4fd76f5f3c8de1
+  metadata.gz: d6352841033d7fa669793cba957a59cc4fa35369d2866914dbb782bb3b507f97
+  data.tar.gz: 66826e73f558d5f2c788d0a5b3b60a413b420f76e47957a517727f51ae7ec15c
 SHA512:
-  metadata.gz: c8dff17ef2cb421f7a799755247190edfdfe39242bd55a0ce9f268109f157b7a94acc138252ea0a3e20c00d7f8b9e9be9f212e5708a0ba5464087e1aa457fb25
-  data.tar.gz: 03b0c38ded3a57c297435ec6f16c1b766303eee451311b3c29c141d81b70d184ac616fe8f91171663a0f1b3cfbe753e439e1044123cf4fd5ee99d76f36a04633
+  metadata.gz: 3d1888b9a7920c0dab4b5c3c30ae8b06acf5ed8e54eaa70e6e848db3ff1dd1087282b42b2a0be1a857935e6497ff662e445383c2be07276a033d7a1ce84fb042
+  data.tar.gz: 74117f74b1181b5d619e27d04f888627ee1d212a9fc66aa78a657374847f8fad9a3b1c999976126db5fab600ef5698a9b699b4d562997a39bbc6940bd3850acb

data/.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
         run: bundle exec rake
       - name: Run tests and upload coverage to Code Climate
         if: ${{ matrix.ruby == '3.0' }}
-        uses: paambaati/codeclimate-action@v3.0.0
+        uses: paambaati/codeclimate-action@v3.1.1
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
         with:

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## [v1.2.0](https://github.com/opus-codium/riemann-bacula/tree/v1.2.0) (2022-10-27)
+
+[Full Changelog](https://github.com/opus-codium/riemann-bacula/compare/v1.1.0...v1.2.0)
+
+**Implemented enhancements:**
+
+- Embed more metadata in events [\#5](https://github.com/opus-codium/riemann-bacula/pull/5) ([smortex](https://github.com/smortex))
+
+## [v1.1.0](https://github.com/opus-codium/riemann-bacula/tree/v1.1.0) (2022-10-20)
+
+[Full Changelog](https://github.com/opus-codium/riemann-bacula/compare/v1.0.0...v1.1.0)
+
+**Implemented enhancements:**
+
+- Join wrapped lines [\#3](https://github.com/opus-codium/riemann-bacula/pull/3) ([smortex](https://github.com/smortex))
+- Add support for parsing restore reports [\#1](https://github.com/opus-codium/riemann-bacula/pull/1) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix parsing of backups of TB of data [\#2](https://github.com/opus-codium/riemann-bacula/pull/2) ([smortex](https://github.com/smortex))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -1,5 +1,9 @@
 # riemann-bacula
 
+[![CI](https://github.com/opus-codium/riemann-bacula/actions/workflows/ci.yml/badge.svg)](https://github.com/opus-codium/riemann-bacula/actions/workflows/ci.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d4206bbc680dc822194b/maintainability)](https://codeclimate.com/github/opus-codium/riemann-bacula/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/d4206bbc680dc822194b/test_coverage)](https://codeclimate.com/github/opus-codium/riemann-bacula/test_coverage)
+
 Submits bacula information to riemann.
 
 ## Get started

data/Rakefile

@@ -15,5 +15,6 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.user = 'opus-codium'
   config.project = 'riemann-bacula'
   config.exclude_labels = ['skip-changelog']
-  config.future_release = Riemann::Tools::Bacula::VERSION
+  config.future_release = "v#{Riemann::Tools::Bacula::VERSION}"
+  config.since_tag = 'v1.0.0'
 end

data/lib/riemann/tools/bacula/version.rb

@@ -3,7 +3,7 @@
 module Riemann
   module Tools # :nodoc:
     class Bacula
-      VERSION = '1.0.0'
+      VERSION = '1.2.0'
     end
   end
 end

data/lib/riemann/tools/bacula.rb

@@ -23,16 +23,24 @@ module Riemann
 
       def parse(text)
         data = {}
+        line_continuation = nil
 
         text.each_line do |line|
           line.chomp!
 
-          next unless line =~ /\A  ([^:]+):[[:blank:]]+(.*)/
+          if line =~ /\A  ([^:]+):[[:blank:]]+(.*)/
+            key = Regexp.last_match(1)
+            raw_value = Regexp.last_match(2)
 
-          key = Regexp.last_match(1)
-          raw_value = Regexp.last_match(2)
+            data[key] = raw_value
+          elsif line_continuation
+            key = line_continuation
+            data[key] += ".#{line}"
+          else
+            next
+          end
 
-          data[key] = raw_value
+          line_continuation = (key if line.length == 998)
         end
 
         return nil unless valid?(data)
@@ -53,16 +61,20 @@ module Riemann
             'FD Bytes Written',
             'SD Bytes Written',
             'Last Volume Bytes',
+            'Bytes Restored',
           ],
           parse_integer: [
             'JobId',
             'Priority',
             'Non-fatal FD errors',
             'FD Files Written',
+            'FD Errors',
             'SD Files Written',
             'SD Errors',
             'Volume Session Id',
             'Volume Session Time',
+            'Files Expected',
+            'Files Restored',
           ],
           parse_duration: [
             'Elapsed time',
@@ -108,7 +120,7 @@ module Riemann
       end
 
       def extract_client_info(data)
-        /\A"([^"]+)" ([^ ]+)/.match(data['Client'])
+        return unless /\A"([^"]+)" ([^ ]+)/.match(data['Client'])
 
         data['Client'] = Regexp.last_match(1)
         data['Client Version'] = Regexp.last_match(2)
@@ -119,14 +131,14 @@ module Riemann
       end
 
       def extract_source(item, data)
-        /\A"([^"]+)" \(From (Client|Job|Pool) resource\)\z/.match(data[item])
+        return unless /\A"([^"]+)" \(From (Client|Job|Pool) resource\)\z/.match(data[item])
 
         data[item] = Regexp.last_match(1)
         data["#{item} Source"] = Regexp.last_match(2)
       end
 
       def extract_time(item, data)
-        /\A"([^"]+)" (.*)\z/.match(data[item])
+        return unless /\A"([^"]+)" (.*)\z/.match(data[item])
 
         data[item] = Regexp.last_match(1)
         data["#{item} time"] = Regexp.last_match(2)
@@ -168,7 +180,8 @@ module Riemann
       end
 
       def parse_size(value)
-        /\A([\d,]+) \([\d.]+ [KMG]?B\)\z/.match(value)
+        raise ArgumentError, %(Cannot parse size "#{value}") unless /\A([\d,]+) \([\d.]+ [KMGT]?B\)\z/.match(value)
+
         parse_integer(Regexp.last_match(1))
       end
 
@@ -180,12 +193,14 @@ module Riemann
         event = {}
         event[:service] = "bacula backup #{data['Job Name']}"
         event[:state] = case data['Termination']
-                        when 'Backup OK' then 'ok'
+                        when /\A(Backup|Restore) OK\z/ then 'ok'
                         when 'Backup OK -- with warnings' then 'warning'
                         else
                           'critical'
                         end
         event[:description] = data['Termination']
+        event[:job_name] = data['Job Name']
+        event[:backup_level] = data['Backup Level']
         report(event)
 
         return unless options[:details]
@@ -205,6 +220,8 @@ module Riemann
           event = {}
           event[:service] = "bacula backup #{data['Job Name']} #{data['Backup Level'].downcase} #{metric.downcase}"
           event[:metric] = data[metric]
+          event[:job_name] = data['Job Name']
+          event[:backup_level] = data['Backup Level']
           report(event)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-bacula
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Romain Tartière
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools
@@ -136,6 +136,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile