Handle HTTP requests the same way

Author: Gavin M. Roy

Diff for: newrelic_plugin_agent/plugins/apache_httpd.py

@@ -76,6 +76,8 @@ def add_datapoints(self, stats):
 
     @property
     def apache_stats_url(self):
+        if 'scheme' not in self.config:
+            self.config['scheme'] = 'http'
         return '%(scheme)s://%(host)s:%(port)s%(path)s?auto' % self.config
 
     def fetch_data(self):
@@ -84,10 +86,13 @@ def fetch_data(self):
         :rtype: str
 
         """
+        kwargs = {'url': self.apache_stats_url,
+                  'verify': self.config.get('verify_ssl_cert', True)}
+        if 'username' in self.config and 'password' in self.config:
+            kwargs['auth'] = (self.config['username'], self.config['password'])
+
         try:
-            response = requests.get(self.apache_stats_url,
-                                    verify=self.config.get('verify_ssl_cert',
-                                                           True))
+            response = requests.get(**kwargs)
         except requests.ConnectionError as error:
             LOGGER.error('Error polling ApacheHTTPD: %s', error)
             return {}
@@ -105,8 +110,6 @@ def fetch_data(self):
     def poll(self):
         LOGGER.info('Polling ApacheHTTPD via %s', self.apache_stats_url)
         start_time = time.time()
-        if 'scheme' not in self.config:
-            self.config['scheme'] = 'http'
         self.derive = dict()
         self.gauge = dict()
         self.rate = dict()

Diff for: newrelic_plugin_agent/plugins/nginx.py

@@ -59,18 +59,23 @@ def add_datapoints(self, stats):
 
     @property
     def nginx_stats_url(self):
-        return 'http://%(host)s:%(port)s/%(path)s' % self.config
+        if 'scheme' not in self.config:
+            self.config['scheme'] = 'http'
+        return '%{scheme}://%(host)s:%(port)s/%(path)s' % self.config
 
     def fetch_data(self):
         """Fetch the data from the Nginx server for the specified data type
 
         :rtype: str
 
         """
+        kwargs = {'url': self.nginx_stats_url,
+                  'verify': self.config.get('verify_ssl_cert', True)}
+        if 'username' in self.config and 'password' in self.config:
+            kwargs['auth'] = (self.config['username'], self.config['password'])
+
         try:
-            response = requests.get(self.nginx_stats_url,
-                                    verify=self.config.get('verify_ssl_cert',
-                                                           True))
+            response = requests.get(**kwargs)
         except requests.ConnectionError as error:
             LOGGER.error('Error polling Nginx: %s', error)
             return {}

Diff for: newrelic_plugin_agent/plugins/rabbitmq.py

@@ -417,9 +417,9 @@ def rabbitmq_base_url(self):
         :rtype: str
 
         """
-        port = self.config.get('port',self.DEFAULT_PORT)
-        secure = self.config.get('secure',False)
-        host = self.config.get('host',self.DEFAULT_HOST)
+        port = self.config.get('port', self.DEFAULT_PORT)
+        secure = self.config.get('secure', False)
+        host = self.config.get('host', self.DEFAULT_HOST)
         if secure:
            return 'https://' + host + ':' + str(port) + '/api'
         else:

Diff for: newrelic_plugin_agent/plugins/riak.py

@@ -174,18 +174,23 @@ def add_datapoints(self, stats):
 
     @property
     def riak_stats_url(self):
-        return 'http://%(host)s:%(port)s/stats' % self.config
+        if 'scheme' not in self.config:
+            self.config['scheme'] = 'http'
+        return '%{scheme}://%(host)s:%(port)s/stats' % self.config
 
     def fetch_data(self):
         """Fetch the data from the Riak server for the specified data type
 
         :rtype: dict
 
         """
+        kwargs = {'url': self.riak_stats_url,
+                  'verify': self.config.get('verify_ssl_cert', True)}
+        if 'username' in self.config and 'password' in self.config:
+            kwargs['auth'] = (self.config['username'], self.config['password'])
+
         try:
-            response = requests.get(self.riak_stats_url,
-                                    verify=self.config.get('verify_ssl_cert',
-                                                           True))
+            response = requests.get(**kwargs)
         except requests.ConnectionError as error:
             LOGGER.error('Error polling Riak: %s', error)
             return {}