riemann-syslog-ng 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8296216cfac86bd15e8a9e7c432f515e23baa06bd20120fd589adb5bef0fbff
-  data.tar.gz: e8f8021b906ceb2192b33c42f1412031271efe1c486cbca40eef0413cce8f537
+  metadata.gz: c6a25c3739014d79a0957c7f5baa20ddd8a13880977175b64aef987fcb8ed359
+  data.tar.gz: 9695440716ecb4d72de12b5a300cd0df0bfe7e367e949e5b225d420bab02a34a
 SHA512:
-  metadata.gz: e5864d1c7796df2aa8defd106231de7ccc016a58c8f6d527935bed9a760d2bd27cf4d0079357637f13093d83f58487564c50bfdb94451dccb3209f45b7622f53
-  data.tar.gz: bf368924284180e7f2d9c134b7d8d50a577e3890203b88638e8d63cdf5f8e905104cc0fa65debf90fc84338d4a47a026f4412103ebe87d4b38f9789dfda30a86
+  metadata.gz: 3f5cdc2e1456974c249d22aeca8a9a160d0ddcdffe0e3a05bc6459d36a0a2b6895946d40417e1237c8ec2f93f5726f8371b7db142938e15f3285e87c0500b5d6
+  data.tar.gz: f4699a8c4d2127546ad2995054fee6718cd245367ba942c8fd939b0ef179102b0a4969793348a9307c3f3c79a02541d209da66f00e36e4fa841f9f0ecf2f8c1b

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "13:00"
+    open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -35,7 +35,7 @@ jobs:
           - "3.3"
     name: Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -46,7 +46,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.1.1
+        uses: paambaati/codeclimate-action@v5.0.0
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_TOKEN }}
         with:

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## [v1.0.1](https://github.com/opus-codium/riemann-syslog-ng/tree/v1.0.1) (2024-01-12)
+
+[Full Changelog](https://github.com/opus-codium/riemann-syslog-ng/compare/v1.0.0...v1.0.1)
+
+**Fixed bugs:**
+
+- Recover when syslog-ng is restarted [\#2](https://github.com/opus-codium/riemann-syslog-ng/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/Rakefile

@@ -14,7 +14,7 @@ require 'github_changelog_generator/task'
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.user = 'opus-codium'
   config.project = 'riemann-syslog-ng'
-  config.exclude_labels = ['skip-changelog']
+  config.exclude_labels = %w[dependencies skip-changelog]
   config.future_release = "v#{Riemann::Tools::SyslogNg::VERSION}"
   config.since_tag = 'v1.0.0'
 end

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

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

data/lib/riemann/tools/syslog_ng.rb

@@ -21,12 +21,12 @@ module Riemann
       opt :queued_warning, 'Queued messages warning threshold', short: :none, default: 300
       opt :queued_critical, 'Queued messages critical threshold', short: :none, default: 1000
 
-      def self.process_stdin
-        new.process_stdin
+      def socket
+        @socket ||= UNIXSocket.new(opts[:socket])
       end
 
-      def initialize
-        @socket = UNIXSocket.new(opts[:socket])
+      def force_reconnect
+        @socket = nil
       end
 
       def tick
@@ -37,21 +37,24 @@ module Riemann
                    state: statistic_state(statistic[:type], statistic[:metric]),
                  })
         end
+      rescue Errno::EPIPE
+        force_reconnect
+        retry
       end
 
       def statistics
         res = []
 
-        @socket.puts 'STATS CSV'
-        @socket.gets # discard header
-        while (line = @socket.gets.chomp) != '.'
+        socket.puts 'STATS CSV'
+        socket.gets # discard header
+        while (line = socket.gets.chomp) != '.'
           source_name, source_id, source_instance, state, type, metric = line.split(';')
 
-          next if opts[:source_name] && !opts[:source_name].include?(source_name)
-          next if opts[:source_id] && !opts[:source_id].include?(source_id)
-          next if opts[:source_instance] && !opts[:source_instance].include?(source_instance)
-          next if opts[:state] && !opts[:state].include?(state)
-          next if opts[:type] && !opts[:type].include?(type)
+          next if rejected_source_name?(source_name)
+          next if rejected_source_id?(source_id)
+          next if rejected_source_instance?(source_instance)
+          next if rejected_state?(state)
+          next if rejected_type?(type)
 
           res << {
             source_name: source_name,
@@ -66,17 +69,45 @@ module Riemann
         res
       end
 
+      def rejected_source_name?(source_name)
+        opts[:source_name] && !opts[:source_name].include?(source_name)
+      end
+
+      def rejected_source_id?(source_id)
+        opts[:source_id] && !opts[:source_id].include?(source_id)
+      end
+
+      def rejected_source_instance?(source_instance)
+        opts[:source_instance] && !opts[:source_instance].include?(source_instance)
+      end
+
+      def rejected_state?(state)
+        opts[:state] && !opts[:state].include?(state)
+      end
+
+      def rejected_type?(type)
+        opts[:type] && !opts[:type].include?(type)
+      end
+
       def statistic_state(type, metric)
         if type == 'dropped'
-          metric == 0.0 ? 'ok' : 'critical'
+          dropped_statistic_state(metric)
         elsif type == 'queued'
-          if metric >= opts[:queued_critical]
-            'critical'
-          elsif metric >= opts[:queued_warning]
-            'warning'
-          else
-            'ok'
-          end
+          queued_statistic_state(metric)
+        end
+      end
+
+      def dropped_statistic_state(metric)
+        metric == 0.0 ? 'ok' : 'critical'
+      end
+
+      def queued_statistic_state(metric)
+        if metric >= opts[:queued_critical]
+          'critical'
+        elsif metric >= opts[:queued_warning]
+          'warning'
+        else
+          'ok'
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-syslog-ng
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Romain Tartière
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools
@@ -33,11 +33,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile