Rename php-fpm to php

Author: kevynlebouille

Dockerfile.debian10

@@ -1,7 +1,7 @@
 FROM sensu-ruby32-runtime-3.2.2-debian10:0.1.2
-ARG ASSET_GEM=sensu-plugins-php-fpm
-ARG GIT_REF=5228dae4548d029b9283050fd2827ca65e123053
-ARG GIT_REPO=https://github.com/opsone/sensu-plugins-php-fpm.git
+ARG ASSET_GEM=sensu-plugins-php
+ARG GIT_REF=344309ccc72248c7cd673dd7e09b76a67a84b026
+ARG GIT_REPO=https://github.com/opsone/sensu-plugins-php.git
 
 WORKDIR /assets/build/
 RUN apt-get update && apt-get install -y git

Dockerfile.debian11

@@ -1,7 +1,7 @@
 FROM sensu-ruby32-runtime-3.2.2-debian11:0.1.2
-ARG ASSET_GEM=sensu-plugins-php-fpm
-ARG GIT_REF=5228dae4548d029b9283050fd2827ca65e123053
-ARG GIT_REPO=https://github.com/opsone/sensu-plugins-php-fpm.git
+ARG ASSET_GEM=sensu-plugins-php
+ARG GIT_REF=344309ccc72248c7cd673dd7e09b76a67a84b026
+ARG GIT_REPO=https://github.com/opsone/sensu-plugins-php.git
 
 WORKDIR /assets/build/
 RUN apt-get update && apt-get install -y git

Rakefile

@@ -8,14 +8,14 @@ RuboCop::RakeTask.new
 task default: :rubocop
 
 task :build_assets do
-  version = Sensu::Plugins::PhpFpm::VERSION
+  version = Sensu::Plugins::Php::VERSION
 
   %w[debian11 debian10].each do |platform|
     `docker build -t ruby-plugin-#{platform} -f Dockerfile.#{platform} .`
-    `docker run -v "$PWD/assets:/tmp/assets" ruby-plugin-#{platform} cp /assets/sensu-plugins-php-fpm.tar.gz /tmp/assets/sensu-plugins-php-fpm_#{version}_#{platform}_linux_amd64.tar.gz`
+    `docker run -v "$PWD/assets:/tmp/assets" ruby-plugin-#{platform} cp /assets/sensu-plugins-php.tar.gz /tmp/assets/sensu-plugins-php_#{version}_#{platform}_linux_amd64.tar.gz`
     `docker rm $(docker ps -a -q --filter ancestor=ruby-plugin-#{platform})`
     `docker rmi ruby-plugin-#{platform}`
   end
 
-  `cd assets && shasum -a 512 ./*.tar.gz > sensu-plugins-php-fpm_#{version}_sha512-checksums.txt`
+  `cd assets && shasum -a 512 ./*.tar.gz > sensu-plugins-php_#{version}_sha512-checksums.txt`
 end

bin/check-php-fpm.rb

@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'net/https'
-require 'openssl'
+require 'net/http'
 require 'sensu-plugin/check/cli'
-require 'uri'
 
 class CheckPhpFpm < Sensu::Plugin::Check::CLI
   option :hostname,
@@ -14,7 +12,7 @@ class CheckPhpFpm < Sensu::Plugin::Check::CLI
          default: '127.0.0.1'
 
   option :port,
-         short: '-P PORT',
+         short: '-p PORT',
          long: '--port PORT',
          description: 'Nginx port',
          proc: proc(&:to_i),
@@ -26,46 +24,18 @@ class CheckPhpFpm < Sensu::Plugin::Check::CLI
          description: 'Path to your fpm ping',
          default: 'fpm-ping'
 
-  option :scheme,
-         description: 'Request scheme to use',
-         short: '-s SCHEME',
-         long: '--scheme SCHEME',
-         default: 'http://'
-
   option :response,
          description: 'Expected response',
          short: '-r RESPONSE',
          long: '--response RESPONSE',
          default: 'pong'
 
-  option :ssl,
-         short: '-l',
-         long: '--ssl',
-         boolean: true,
-         description: 'Enabling SSL connections',
-         default: false
-
-  option :insecure,
-         short: '-k',
-         long: '--insecure',
-         boolean: true,
-         description: 'Enabling insecure connections',
-         default: false
-
   def run
-    url = "#{config[:scheme]}#{config[:hostname]}:#{config[:port]}/#{config[:path]}"
-    uri = URI.parse(url)
-
-    request = Net::HTTP::Get.new(uri.request_uri)
-    http = Net::HTTP.new(uri.host, uri.port)
-
-    if config[:ssl]
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if config[:insecure]
+    response = Net::HTTP.start(config[:hostname], config[:port]) do |connection|
+      request = Net::HTTP::Get.new("/#{config[:path]}")
+      connection.request(request)
     end
 
-    response = http.request(request)
-
     if response.code == '200'
       if response.body == config[:response]
         ok config[:response].to_s

lib/sensu/plugins/php_fpm.rb lib/sensu/plugins/php.rblib/sensu/plugins/php_fpm.rb renamed to lib/sensu/plugins/php.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'php_fpm/version'
+require_relative 'php/version'
 
 module Sensu
   module Plugins
-    module PhpFpm
+    module Php
       class Error < StandardError; end
     end
   end

lib/sensu/plugins/php_fpm/version.rb lib/sensu/plugins/php/version.rblib/sensu/plugins/php_fpm/version.rb renamed to lib/sensu/plugins/php/version.rb

@@ -2,8 +2,8 @@
 
 module Sensu
   module Plugins
-    module PhpFpm
-      VERSION = '0.1.0'
+    module Php
+      VERSION = '0.2.0'
     end
   end
 end

sensu-plugins-php-fpm.gemspec sensu-plugins-php.gemspecsensu-plugins-php-fpm.gemspec renamed to sensu-plugins-php.gemspec

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require_relative 'lib/sensu/plugins/php_fpm'
+require_relative 'lib/sensu/plugins/php'
 
 Gem::Specification.new do |spec|
-  spec.name = 'sensu-plugins-php-fpm'
-  spec.version = Sensu::Plugins::PhpFpm::VERSION
+  spec.name = 'sensu-plugins-php'
+  spec.version = Sensu::Plugins::Php::VERSION
   spec.authors = ['Kevyn Lebouille']
   spec.email = ['kevyn.lebouille@opsone.net']
 
   spec.summary = 'This plugin provides facilities for monitoring PHP FPM'
-  spec.homepage = 'https://github.com/opsone/sensu-plugins-php-fpm'
+  spec.homepage = 'https://github.com/opsone/sensu-plugins-php'
   spec.required_ruby_version = '>= 3.2.0'
 
   spec.metadata['allowed_push_host'] = "TODO: Set to your gem server 'https://example.com'"
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/opsone/sensu-plugins-php-fpm'
-  spec.metadata['changelog_uri'] = 'https://github.com/opsone/sensu-plugins-php-fpm/CHANGELOG.md'
+  spec.metadata['source_code_uri'] = 'https://github.com/opsone/sensu-plugins-php'
+  spec.metadata['changelog_uri'] = 'https://github.com/opsone/sensu-plugins-php/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.