Add the possibility of other aggregations

CHANGELOG.md

@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
+### Changed
+- elasticsearch-query.rb: changed literal aggregation name and 'type' to config vars
+- check-es-query-average.rb: changed literal aggregation name average and type avg to use the new config vars
 
 ## [4.0.0] - 2019-05-07
 ### Breaking Changes

bin/check-es-query-average.rb

@@ -255,6 +255,8 @@ def kibana_info
   end
 
   def run
+    config[:aggr_name] = 'average'
+    config[:aggr_type] = 'avg'
     response = client.search(build_request_options)
     if config[:invert]
       if response['aggregations']['average']['value'] < config[:crit]

lib/sensu-plugins-elasticsearch/elasticsearch-query.rb

@@ -100,7 +100,7 @@ def build_request_options
           }
         },
         'aggregations' => {
-          'average' => { 'avg' => { 'field' => config[:aggr_field] } }
+          config[:aggr_name] => { config[:aggr_type] => { 'field' => config[:aggr_field] } }
         }
       }
     else