logstash-output-zabbix 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76bcbc8561c38df609e886626472e7e37b204b68
-  data.tar.gz: 6516cac2c9a4a122a4b81e7bc3b293d627d55ed4
+  metadata.gz: 4f335e6edeefc3b732deae8543f1a88070d4b243
+  data.tar.gz: 841ef0e1a70580884bde00cfabf7b883813a3179
 SHA512:
-  metadata.gz: 5ee793abccbf94ceca9f562b9b4a165633d9d6493180bcb51dc30ff1a07c64224b410f5102eb79e2e6102ef64175bfaa2f0f015fdfaf780f9f4f95e06379fac7
-  data.tar.gz: ffbcc57435de0c6abd6ee51e7d941a77a6b2dcb2c3e2e59f72215dfb5a16ce8651146ffa246e9772ebe88031655025a2e5391f3a86c152161bb0628cc80ae9c7
+  metadata.gz: 8619695947f1058e2556cbf49ac134d2dd0dfe60e108a7766844028b21fe0804f18d577f243e7de163f3aff8938c1ea368490f75ae6b58d36ec8d4bd7c147780
+  data.tar.gz: 19ccda7d3fd84468fb51e8c665130700fe9847d0927087ac887c53bfc225c2bd99ced5c2a692e66660133cdcae1398cfce156d348c4c7704629135a5a349032f

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+ - Update to allow semicolons (or not, e.g. Zabbix 2.0). #6 (davmrtl)
+ - Update to prevent Logstash from crashing when the Zabbix server becomes unavailable while the plugin is sending data. #9 (dkanbier) 

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/lib/logstash/outputs/zabbix.rb

@@ -174,8 +174,8 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
       return false
     end
     # Prune the semicolons, then turn it into an array
-    info = (data["info"].delete! ';').split()
-    # ["processed", "0", "Failed", ";", "Total", "1", "seconds", "spent:", "0.000018"]
+    info = data["info"].tr(';', '').split()
+    # ["processed", "0", "Failed", "1", "Total", "1", "seconds", "spent:", "0.000018"]
     failed = info[3].to_i
     total = info[5].to_i
     if failed == total
@@ -208,7 +208,7 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
         # Did the message get received by Zabbix?
         response_check(event, resp)
       end
-    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET
       @logger.error("Connection error.  Unable to connect to Zabbix server",
         :server => @zabbix_server_host,
         :port => @zabbix_server_port.to_s
@@ -234,7 +234,7 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
 
   public
   def receive(event)
-    return unless output?(event)
+    
     return unless field_check(event, @zabbix_host)
     send_to_zabbix(event)
   end # def event

data/logstash-output-zabbix.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-zabbix'
-  s.version       = "1.0.0"
+  s.version       = "2.0.0"
   s.licenses      = ["Apache License (2.0)"]
   s.summary       = "This output sends key/value pairs to a Zabbix server."
   s.description   = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
    # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 1.4.0", "< 2.0.0"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
   s.add_runtime_dependency "zabbix_protocol"
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_development_dependency "logstash-devutils", ">= 0.0.12"

metadata

@@ -1,125 +1,118 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-zabbix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.beta2
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: zabbix_protocol
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.beta2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: zabbix_protocol
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.12
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-filter-mutate
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.12
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-filter-mutate
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: longshoreman
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: longshoreman
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - DEVELOPER.md
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
-- Rakefile
-- docker/Dockerfile
-- docker/README.md
-- docker/build_db.sh
-- docker/run.sh
-- docker/zabbix.conf.php
-- docker/zabbix.sql
 - lib/logstash/outputs/zabbix.rb
 - logstash-output-zabbix.gemspec
 - spec/helpers/zabbix_helper.rb
@@ -146,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This output sends key/value pairs to a Zabbix server.

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-Gemfile.lock
-Gemfile.bak
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"

data/docker/Dockerfile

@@ -1,48 +0,0 @@
-FROM ubuntu:14.04
-
-MAINTAINER Aaron Mildenstein <aaron@mildensteins.com>
-
-RUN apt-get -qq update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yqq install mysql-server
-#RUN apt-get -yqq install php5-mysql zabbix-frontend-php
-RUN apt-get -yqq install zabbix-server-mysql
-
-# Change PHP setup
-#RUN sed -i -e 's/^post_max_size =.*/post_max_size = 16M/' -e 's/^max_execution_time.*/max_execution_time = 300/' \
-#           -e 's/^max_input_time.*/max_input_time = 300/' -e 's/;date.timezone.*/date.timezone = America\/Denver/' /etc/php5/apache2/php.ini
-
-# Setup Apache
-#RUN cp /usr/share/doc/zabbix-frontend-php/examples/apache.conf /etc/apache2/conf-available/zabbix.conf
-#RUN ln -s /etc/apache2/conf-available/zabbix.conf /etc/apache2/conf-enabled/zabbix.conf
-#COPY zabbix.conf.php /etc/zabbix/zabbix.conf.php
-
-# Set to allow Zabbix to run
-RUN sed -i s/START=no/START=yes/g /etc/default/zabbix-server
-
-# Create this dir and change permissions (the package doesn't, for some reason)
-RUN mkdir -p /var/run/zabbix
-RUN chown zabbix:zabbix /var/run/zabbix
-
-# Configure zabbix_server.conf
-RUN sed -i -e 's/^# StartPollers=5/StartPollers=1/' \
-	   -e 's/^# StartPollersUnreachable=1/StartPollersUnreachable=0/' \
-	   -e 's/^# StartTrappers=5/StartTrappers=1/' \
-	   -e 's/^# StartPingers=1/StartPingers=0/' \
-	   -e 's/^# StartDiscoverers=1/StartDiscoverers=0/' \
-	   -e 's/^# StartHTTPPollers=1/StartHTTPPollers=0/' \
-	   -e 's/^# StartDBSyncers=4/StartDBSyncers=2/' \
-	   -e 's/^DBUser=zabbix/DBUser=root/' \
-	   -e 's/^# DBSocket=\/tmp\/mysql.sock/DBSocket=\/var\/run\/mysqld\/mysqld.sock/' \ 
-	   -e 's/^# StartProxyPollers=1/StartProxyPollers=0/' /etc/zabbix/zabbix_server.conf
-
-# Expose the Ports used by
-# * Zabbix services
-# * Apache with Zabbix UI (Add port 80 below)
-
-EXPOSE 10051
-
-COPY build_db.sh /
-COPY run.sh /
-COPY zabbix.sql /
-RUN ln -s /run.sh /usr/bin/run
-

data/docker/README.md

@@ -1,89 +0,0 @@
-# Docker Image For Testing This Plugin
-
-The current image tag is: `latest`
-
-## Docker Hub
-
-The completed image is hosted at https://registry.hub.docker.com/u/untergeek/logstash_output_zabbix_rspec/
-
-You can manually pull it to your Docker installation by running
-
-    docker pull untergeek/logstash_output_zabbix_rspec:latest
-
-Learn more about Docker at http://docs.docker.com
-
-## How the image was created
-
-**Prerequisite: Database SQL file creation**
-
-This image is currently built using a multi-stage process. Because creating
-items either requires the API or SQL access, I opted to first build an image
-with Apache & PHP so it would have a front-end.  After building a successful
-Zabbix installation, I created items and dumped the MySQL of the full db into
-`zabbix.sql`.  The vestiges of this remain commented in the `Dockerfile`.
-
-### Building the image
-
-A new Zabbix Server image had to be built based on the database from the previous
-step.  The `Dockerfile` is what built this with these steps:
-
-#### 1. Build the initial image:
-* `docker build .`
-* Get the docker image id from this step and use in the next step
-
-#### 2. Create the database on the initial image:
-**Run the image from step 1 in an interactive shell:**
-
-* Run `docker run -i -t IMAGE_ID /bin/bash` from the container host
-* Run `/build_db.sh` from the resulting shell.
-
-**Do NOT exit the shellwhen this is done.**
-
-#### 3. Commit the changes to a new image:
-From another shell on the container host, commit the changes (the populated
-database) from the initial image into a _new_ image:
-
-```
-docker commit \
-  --author="Aaron Mildenstein <aaron@mildensteins.com>" \
-  --message="Populated the database" \
-  IMAGE_ID \
-  untergeek/logstash_output_zabbix_rspec:latest
-```
-
-#### 4. Push the image to Docker Hub:
-
-The image is then pushed to the Docker Hub:
-
-    docker push untergeek/logstash_output_zabbix_rspec:latest
-
-### Running the image
-
-While the RSpec test handles creating a container from this image, and then
-deletes it when done, you can manually run the image, if needed:
-
-    docker run -i --name="logstash_zabbix_rspec" -t -d -p 10051:10051 untergeek/logstash_output_zabbix_rspec:latest run
-
-This command ensures that port 10051 is forwarded from the container to the
-container host.  The `run` command at the end runs `run.sh` as in this directory.
-
-#### Manual/interactive container use
-
-You can also run Zabbix interactively, as though you were on the server:
-
-    docker run -i -t -p 10051:10051 untergeek/logstash_output_zabbix_rspec:latest /bin/bash
-
-At this point, you'd need to run `service mysql start` and `service zabbix-server start`
-to fully initialize the server, but you have the ability to see the logs, or
-query the MySQL directly.  Exiting the shell will close and delete the container.
-
-### Stopping the image
-
-If you ran a container in detached (`-d`) mode, you can stop the running image
-by running:
-
-    docker stop logstash_zabbix_rspec
-
-This will only work if you included `--name="logstash_zabbix_rspec"` in your
-`docker run` command-line.  You will otherwise have to run `docker ps` and find
-the container id.

data/docker/build_db.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Start MySQL
-/etc/init.d/mysql start
-
-# Build the Zabbix Database
-/etc/init.d/mysql start
-
-# Build the Zabbix Database
-mysql < /zabbix.sql
-
-# Flush tables and logs
-mysqladmin refresh
-
-# Stop it again afterwards
-/etc/init.d/mysql stop
-
-### Instructions for building the original db
-
-#echo 'create database zabbix character set utf8 collate utf8_bin' > /create.sql
-#mysql < /create.sql
-
-#cd /usr/share/zabbix-server-mysql/
-#for file in $(ls *.gz); do gunzip $file; done
-#mysql zabbix < schema.sql
-#mysql zabbix < images.sql
-#mysql zabbix < data.sql
-
-### Run Zabbix, create your items, then mysqldump to zabbix.sql

data/docker/run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-
-# Start MySQL
-/etc/init.d/mysql start
-
-# Start Zabbix
-/etc/init.d/zabbix-server start 
-
-bash

data/docker/zabbix.conf.php

@@ -1,20 +0,0 @@
-<?php
-// Zabbix GUI configuration file
-global $DB;
-
-$DB['TYPE']     = 'MYSQL';
-$DB['SERVER']   = 'localhost';
-$DB['PORT']     = '0';
-$DB['DATABASE'] = 'zabbix';
-$DB['USER']     = 'root';
-$DB['PASSWORD'] = '';
-
-// SCHEMA is relevant only for IBM_DB2 database
-$DB['SCHEMA'] = '';
-
-$ZBX_SERVER      = 'localhost';
-$ZBX_SERVER_PORT = '10051';
-$ZBX_SERVER_NAME = '';
-
-$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG;
-?>