[php-fpm] Add a parameter for ping_reply (#417)

* [php-fpm] Add a parameter for ping_reply

* [php-fpm] Fix syntax error in test (#417)

Author: Aramack

manifests/integrations/php_fpm.pp

@@ -9,6 +9,9 @@
 #   $ping_url
 #        URL to get a reliable check of the FPM pool. Default: http://localhost/ping
 #
+#   $ping_reply
+#        Expected response from ping_url. Default: pong
+#
 #   $tags
 #        Optional array of tags
 #
@@ -23,6 +26,7 @@
 class datadog_agent::integrations::php_fpm(
   $status_url       = 'http://localhost/status',
   $ping_url         = 'http://localhost/ping',
+  $ping_reply       = 'pong',
   $http_host        = undef,
   $tags             = [],
   $instances        = undef
@@ -34,6 +38,7 @@
       'http_host' => $http_host,
       'status_url' => $status_url,
       'ping_url' => $ping_url,
+      'ping_reply' => $ping_reply,
       'tags' => $tags,
     }]
   } else {

spec/classes/datadog_agent_integrations_php_fpm_spec.rb

@@ -31,25 +31,30 @@
       context 'with default parameters' do
         it { should contain_file(conf_file).with_content(/status_url: http:\/\/localhost\/status/) }
         it { should contain_file(conf_file).with_content(/ping_url: http:\/\/localhost\/ping/) }
+        it { should contain_file(conf_file).with_content(/ping_reply: pong/) }
       end
 
       context 'with parameters set' do
         let(:params) {{
           status_url: 'http://localhost/fpm_status',
           ping_url: 'http://localhost/fpm_ping',
+          ping_reply: 'success',
         }}
         it { should contain_file(conf_file).with_content(/status_url: http:\/\/localhost\/fpm_status/) }
         it { should contain_file(conf_file).with_content(/ping_url: http:\/\/localhost\/fpm_ping/) }
+        it { should contain_file(conf_file).with_content(/ping_reply: success/) }
       end
 
       context 'with http_host set' do
         let(:params) {{
           status_url: 'http://localhost/fpm_status',
           ping_url: 'http://localhost/fpm_ping',
+          ping_reply: 'success',
           http_host: 'php_fpm_server',
         }}
         it { should contain_file(conf_file).with_content(/http_host: php_fpm_server/) }
         it { should contain_file(conf_file).with_content(/status_url: http:\/\/localhost\/fpm_status/) }
+        it { should contain_file(conf_file).with_content(/ping_reply: success/) }
         it { should contain_file(conf_file).with_content(/ping_url: http:\/\/localhost\/fpm_ping/) }
       end
 
@@ -63,13 +68,16 @@
             {
               'status_url'   => 'http://localhost/b/fpm_status',
               'ping_url'   => 'http://localhost/b/fpm_ping',
+              'ping_reply' => 'success',
             },
           ]
         }}
         it { should contain_file(conf_file).with_content(/status_url: http:\/\/localhost\/a\/fpm_status/) }
         it { should contain_file(conf_file).with_content(/ping_url: http:\/\/localhost\/a\/fpm_ping/) }
+        it { should contain_file(conf_file).with_content(/ping_reply: pong/) }
         it { should contain_file(conf_file).with_content(/status_url: http:\/\/localhost\/b\/fpm_status/) }
         it { should contain_file(conf_file).with_content(/ping_url: http:\/\/localhost\/b\/fpm_ping/) }
+        it { should contain_file(conf_file).with_content(/ping_reply: success/) }
       end
     end
   end

templates/agent-conf.d/php_fpm.yaml.erb

@@ -10,7 +10,7 @@ instances:
     # Get a reliable service check of your FPM pool with that one
     ping_url: <%= instance['ping_url'] %>
     # Set the expected reply to the ping.
-    ping_reply: pong
+    ping_reply: <%= instance['ping_reply'] ? instance['ping_reply'] : 'pong' %>
     <%- if instance['http_host'] -%>
     # Set http host header
     http_host: <%= instance['http_host'] %>