Add config option

Add config option monasca_statsd_port to configure statsd port
via monasca-setup.
Sync oslo.utils with global requirements.

Fixes-Bug: #1628401
Change-Id: Ie7b517f06f7b93e5929776ab4a77a388458e3b4b
(cherry picked from commit f79a238844)

agent.yaml.template

@@ -108,7 +108,7 @@ Statsd:
   # Monasca Statsd is a small server that aggregates your custom app metrics.
 
   #  Make sure your client is sending to the same port.
-  monasca_statsd_port : 8125
+  monasca_statsd_port : {args.monasca_statsd_port}
 
   ## The monasca_statsd flush period.
   # monasca_statsd_interval : 20

docs/Agent.md

@@ -114,6 +114,7 @@ All parameters require a '--' before the parameter such as '--verbose'. Run `mon
 | detection_args | Some detection plugins can be passed arguments. This is a string that will be passed to the detection plugins. | "hostname=ping.me" |
 | max_measurement_buffer_size | Integer value for the maximum number of measurements to buffer locally while unable to connect to the monasca-api. If the queue exceeds this value, measurements will be dropped in batches. A value of '-1' indicates no limit | 100000 |
 | backlog_send_rate | Integer value of how many batches of buffered measurements to send each time the forwarder flushes data | 1000 |
+| monasca_statsd_port | Integer value for statsd daemon port number | 8125 |
 
 ### Providing Arguments to Detection plugins
 When running individual detection plugins you can specify arguments that augment the configuration created. In some instances the arguments just provide additional

monasca_setup/main.py

@@ -280,6 +280,9 @@ def parse_arguments(parser):
                         help="Maximum number of buffered batches of measurements to send at"
                              " one time when connection to the monasca-api is restored",
                         default=1000)
+    parser.add_argument('--monasca_statsd_port',
+                        help="Statsd daemon port number",
+                        default=8125)
     return parser.parse_args()
 
 

requirements.txt

@@ -3,7 +3,7 @@ requests>=2.7.0,<=2.10.0
 oslo.concurrency<=3.13.0
 oslo.config<=3.14.0
 oslo.i18n<=3.8.0
-oslo.utils<=3.16.0
+oslo.utils>=3.18.0
 oslo.vmware>=1.16.0,<=2.10.0
 
 PyYAML>=3.1.0,<=3.11