Remove Monasca Sink

docs/sink-configuration.md

@@ -99,29 +99,6 @@ can enable opentsdb sink like this:
 
     --sink=opentsdb:http://192.168.1.8:4242
 
-### Monasca
-This sink supports monitoring metrics only.
-To use the Monasca sink add the following flag:
-
-	--sink=monasca:[?<OPTIONS>]
-
-The available options are listed below, and some of them are mandatory. You need to provide access to the Identity service of OpenStack (keystone).
-Currently, only authorization through `username` / `userID` + `password` / `APIKey` is supported. If the agent access (for sending metrics) to Monasca is restricted to a role, please specify the corresponding `tenant-id` for automatic scoped authorization.
-
-The Monasca sink is then created with either the provided Monasca API Server URL, or the URL is discovered automatically if none is provided by the user.
-
-The following options are available:
-
-* `user-id` - ID of the OpenStack user
-* `username` - Name of the OpenStack user
-* `tenant-id` - ID of the OpenStack tenant (project)
-* `keystone-url` - URL to the Keystone identity service (*mandatory*). Must be a v3 server (required by Monasca)
-* `password` - Password of the OpenStack user
-* `api-key` - API-Key for the OpenStack user
-* `domain-id` - ID of the OpenStack user's domain
-* `domain-name` - Name of the OpenStack user's domain
-* `monasca-url` - URL of the Monasca API server (*optional*: the sink will attempt to discover the service if not provided)
-
 ### Kafka
 This sink supports monitoring metrics only.
 To use the kafka sink add the following flag:

docs/sink-owners.md

@@ -31,10 +31,7 @@ List of Owners
 | InfluxDB        | :heavy_check_mark: | :heavy_check_mark: | @kubernetes/heapster-maintainers / @andyxning | :ok:           |
 | Metric (memory) | :heavy_check_mark: | :x:                | @kubernetes/heapster-maintainers              | :ok:           |
 | Kafka           | :heavy_check_mark: | :x:                | @huangyuqi                                    | :ok:           |
-| Monasca         | :heavy_check_mark: | :x:                |                                               | :no_entry: [1] |
 | OpenTSDB        | :heavy_check_mark: | :x:                | @bluebreezecf                                 | :ok:           |
 | Riemann         | :heavy_check_mark: | :x: :new:          | @jamtur01 @mcorbin                            | :ok:           |
 | Graphite        | :heavy_check_mark: | :x:                | @jsoriano / @theairkit                        | :new: #1341    |
 | Wavefront       | :heavy_check_mark: | :x:                | @ezeev                                        | :new: #1400    |
-
-- [1] Monasca now has native support for Kubernetes, so this is no longer needed (see https://github.com/kubernetes/heapster/issues/1407#issuecomment-266008730 and https://github.com/openstack/monasca-agent/blob/master/docs/Plugins.md#docker)

metrics/sinks/factory.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/heapster/metrics/sinks/kafka"
 	"k8s.io/heapster/metrics/sinks/log"
 	"k8s.io/heapster/metrics/sinks/metric"
-	"k8s.io/heapster/metrics/sinks/monasca"
 	"k8s.io/heapster/metrics/sinks/opentsdb"
 	"k8s.io/heapster/metrics/sinks/riemann"
 )
@@ -57,8 +56,6 @@ func (this *SinkFactory) Build(uri flags.Uri) (core.DataSink, error) {
 		return metricsink.NewMetricSink(140*time.Second, 15*time.Minute, []string{
 			core.MetricCpuUsageRate.MetricDescriptor.Name,
 			core.MetricMemoryUsage.MetricDescriptor.Name}), nil
-	case "monasca":
-		return monasca.CreateMonascaSink(&uri.Val)
 	case "opentsdb":
 		return opentsdb.CreateOpenTSDBSink(&uri.Val)
 	case "riemann":