[config] Remove deprecated configuration fields

CHANGELOG.md

@@ -485,7 +485,7 @@ If you run into any issues with the upgrade or need to downgrade to a previous v
 ## Features
 
 - **M3Query**: Add multi-zone and multi-region configuration for coordinator ([#1687](https://github.com/m3db/m3/pull/1687))
-- **M3Query**: Add debug param to `GET` `/api/v1/namespace` endpoint for better readability ([#1698](https://github.com/m3db/m3/pull/1698))
+- **M3Query**: Add debug param to `GET` `/api/v1/services/m3db/namespace` endpoint for better readability ([#1698](https://github.com/m3db/m3/pull/1698))
 - **M3Coordinator**: Add "ingest_latency" histogram metric and return datapoint too old/new errors with offending timestamps ([#1716](https://github.com/m3db/m3/pull/1716))
 
 ## Performance

config/m3db/clustered-etcd/generated.yaml

@@ -22,11 +22,6 @@
     "idScheme": "quoted"
 "db":
   "bootstrap":
-    "bootstrappers":
-    - "filesystem"
-    - "commitlog"
-    - "peers"
-    - "uninitialized_topology"
     "commitlog":
       "returnUnfulfilledForCorruptCommitLogFiles": false
   "cache":

config/m3db/clustered-etcd/m3dbnode.libsonnet

@@ -104,12 +104,6 @@ function(cluster, coordinator={}, db={}) {
     "writeNewSeriesLimitPerSecond": 1048576,
     "writeNewSeriesBackoffDuration": "2ms",
     "bootstrap": {
-      "bootstrappers": [
-        "filesystem",
-        "commitlog",
-        "peers",
-        "uninitialized_topology"
-      ],
       "commitlog": {
         "returnUnfulfilledForCorruptCommitLogFiles": false
       }

config/m3db/local-etcd/generated.yaml

@@ -1,6 +1,4 @@
 "coordinator":
-  "limits":
-    "maxComputedDatapoints": 10000
   "listenAddress":
     "type": "config"
     "value": "0.0.0.0:7201"
@@ -24,11 +22,6 @@
     "idScheme": "quoted"
 "db":
   "bootstrap":
-    "bootstrappers":
-    - "filesystem"
-    - "commitlog"
-    - "peers"
-    - "uninitialized_topology"
     "commitlog":
       "returnUnfulfilledForCorruptCommitLogFiles": false
   "cache":

config/m3db/local-etcd/m3dbnode.libsonnet

@@ -28,9 +28,6 @@ function(coordinator={}, db={}) {
       "samplingRate": 1.0,
       "extended": "none"
     },
-    "limits": {
-      "maxComputedDatapoints": 10000
-    },
     "tagOptions": {
       // Configuration setting for generating metric IDs from tags.
       "idScheme": "quoted"
@@ -66,12 +63,6 @@ function(coordinator={}, db={}) {
     "writeNewSeriesLimitPerSecond": 1048576,
     "writeNewSeriesBackoffDuration": "2ms",
     "bootstrap": {
-      "bootstrappers": [
-        "filesystem",
-        "commitlog",
-        "peers",
-        "uninitialized_topology"
-      ],
       "commitlog": {
         "returnUnfulfilledForCorruptCommitLogFiles": false
       }

kube/m3dbnode-configmap.yaml

@@ -6,9 +6,7 @@ metadata:
 data:
   m3dbnode.yml: |+
     coordinator:
-      listenAddress:
-        type: "config"
-        value: "0.0.0.0:7201"
+      listenAddress: 0.0.0.0:7201
       local:
         namespaces:
             - namespace: default
@@ -59,11 +57,6 @@ data:
       writeNewSeriesBackoffDuration: 2ms
 
       bootstrap:
-        bootstrappers:
-            - filesystem
-            - commitlog
-            - peers
-            - uninitialized_topology
         commitlog:
           returnUnfulfilledForCorruptCommitLogFiles: false
 

kube/terraform/main.tf

@@ -133,7 +133,7 @@ resource "kubernetes_config_map" "m3dbnode_config" {
     namespace = "m3db"
   }
   data {
-    m3dbnode.yml = "coordinator:\n  listenAddress:\n    type: \"config\"\n    value: \"0.0.0.0:7201\"\n  local:\n    namespaces:\n        - namespace: default\n          type: unaggregated\n          retention: 48h\n  metrics:\n    scope:\n      prefix: \"coordinator\"\n    prometheus:\n      handlerPath: /metrics\n      listenAddress: 0.0.0.0:7203\n    sanitization: prometheus\n    samplingRate: 1.0\n    extended: none\n  tagOptions:\n    idScheme: quoted\n\ndb:\n  logging:\n    level: info\n\n  metrics:\n    prometheus:\n      handlerPath: /metrics\n    sanitization: prometheus\n    samplingRate: 1.0\n    extended: detailed\n\n  listenAddress: 0.0.0.0:9000\n  clusterListenAddress: 0.0.0.0:9001\n  httpNodeListenAddress: 0.0.0.0:9002\n  httpClusterListenAddress: 0.0.0.0:9003\n  debugListenAddress: 0.0.0.0:9004\n\n  hostID:\n    resolver: hostname\n\n  client:\n    writeConsistencyLevel: majority\n    readConsistencyLevel: unstrict_majority\n\n  gcPercentage: 100\n\n  writeNewSeriesAsync: true\n  writeNewSeriesLimitPerSecond: 1048576\n  writeNewSeriesBackoffDuration: 2ms\n\n  bootstrap:\n    bootstrappers:\n        - filesystem\n        - commitlog\n        - peers\n        - uninitialized_topology\n    fs:\n      numProcessorsPerCPU: 0.125\n    commitlog:\n      returnUnfulfilledForCorruptCommitLogFiles: false\n\n  commitlog:\n    flushMaxBytes: 524288\n    flushEvery: 1s\n    queue:\n      calculationType: fixed\n      size: 2097152\n\n  fs:\n    filePathPrefix: /var/lib/m3db\n\n  config:\n    service:\n        env: default_env\n        zone: embedded\n        service: m3db\n        cacheDir: /var/lib/m3kv\n        etcdClusters:\n        - zone: embedded\n          endpoints:\n          - http://etcd-0.etcd:2379\n          - http://etcd-1.etcd:2379\n          - http://etcd-2.etcd:2379\n"
+    m3dbnode.yml = "coordinator:\n  listenAddress:\n    type: \"config\"\n    value: \"0.0.0.0:7201\"\n  local:\n    namespaces:\n        - namespace: default\n          type: unaggregated\n          retention: 48h\n  metrics:\n    scope:\n      prefix: \"coordinator\"\n    prometheus:\n      handlerPath: /metrics\n      listenAddress: 0.0.0.0:7203\n    sanitization: prometheus\n    samplingRate: 1.0\n    extended: none\n  tagOptions:\n    idScheme: quoted\n\ndb:\n  logging:\n    level: info\n\n  metrics:\n    prometheus:\n      handlerPath: /metrics\n    sanitization: prometheus\n    samplingRate: 1.0\n    extended: detailed\n\n  listenAddress: 0.0.0.0:9000\n  clusterListenAddress: 0.0.0.0:9001\n  httpNodeListenAddress: 0.0.0.0:9002\n  httpClusterListenAddress: 0.0.0.0:9003\n  debugListenAddress: 0.0.0.0:9004\n\n  hostID:\n    resolver: hostname\n\n  client:\n    writeConsistencyLevel: majority\n    readConsistencyLevel: unstrict_majority\n\n  gcPercentage: 100\n\n  writeNewSeriesAsync: true\n  writeNewSeriesLimitPerSecond: 1048576\n  writeNewSeriesBackoffDuration: 2ms\n\n  bootstrap:\n    fs:\n      numProcessorsPerCPU: 0.125\n    commitlog:\n      returnUnfulfilledForCorruptCommitLogFiles: false\n\n  commitlog:\n    flushMaxBytes: 524288\n    flushEvery: 1s\n    queue:\n      calculationType: fixed\n      size: 2097152\n\n  fs:\n    filePathPrefix: /var/lib/m3db\n\n  config:\n    service:\n        env: default_env\n        zone: embedded\n        service: m3db\n        cacheDir: /var/lib/m3kv\n        etcdClusters:\n        - zone: embedded\n          endpoints:\n          - http://etcd-0.etcd:2379\n          - http://etcd-1.etcd:2379\n          - http://etcd-2.etcd:2379\n"
   }
 }
 

scripts/comparator/m3query.yml

@@ -1,6 +1,4 @@
-listenAddress:
-  type: "config"
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 backend: grpc
 

scripts/development/m3_stack/m3collector.yml

@@ -1,6 +1,4 @@
-listenAddress:
-  type: config
-  value: 0.0.0.0:7206
+listenAddress: 0.0.0.0:7206
 
 metrics:
   scope:

scripts/development/m3_stack/m3coordinator-aggregator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/development/m3_stack/m3coordinator-standard.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/development/m3_stack/m3dbnode.yml

@@ -39,11 +39,6 @@ db:
   writeNewSeriesBackoffDuration: 2ms
 
   bootstrap:
-    bootstrappers:
-        - filesystem
-        - peers
-        - commitlog
-        - uninitialized_topology
     commitlog:
       returnUnfulfilledForCorruptCommitLogFiles: false
 

scripts/development/m3_stack/start_m3.sh

@@ -172,7 +172,7 @@ else
 fi
 
 echo "Initializing namespaces"
-curl -vvvsSf -X POST localhost:7201/api/v1/namespace -d '{
+curl -vvvsSf -X POST localhost:7201/api/v1/services/m3db/namespace -d '{
   "name": "metrics_0_30m",
   "options": {
     "bootstrapEnabled": true,
@@ -202,7 +202,7 @@ curl -vvvsSf -X POST localhost:7201/api/v1/namespace -d '{
     }
   }
 }'
-curl -vvvsSf -X POST localhost:7201/api/v1/namespace -d '{
+curl -vvvsSf -X POST localhost:7201/api/v1/services/m3db/namespace -d '{
   "name": "metrics_30s_24h",
   "options": {
     "bootstrapEnabled": true,
@@ -239,13 +239,13 @@ curl -vvvsSf -X POST localhost:7201/api/v1/namespace -d '{
 echo "Done initializing namespaces"
 
 echo "Validating namespace"
-[ "$(curl -sSf localhost:7201/api/v1/namespace | jq .registry.namespaces.metrics_0_30m.indexOptions.enabled)" == true ]
-[ "$(curl -sSf localhost:7201/api/v1/namespace | jq .registry.namespaces.metrics_30s_24h.indexOptions.enabled)" == true ]
+[ "$(curl -sSf localhost:7201/api/v1/services/m3db/namespace | jq .registry.namespaces.metrics_0_30m.indexOptions.enabled)" == true ]
+[ "$(curl -sSf localhost:7201/api/v1/services/m3db/namespace | jq .registry.namespaces.metrics_30s_24h.indexOptions.enabled)" == true ]
 echo "Done validating namespace"
 
 echo "Initializing topology"
 if [[ "$USE_MULTI_DB_NODES" = true ]] ; then
-    curl -vvvsSf -X POST localhost:7201/api/v1/placement/init -d '{
+    curl -vvvsSf -X POST localhost:7201/api/v1/services/m3db/placement/init -d '{
         "num_shards": 64,
         "replication_factor": 3,
         "instances": [
@@ -279,7 +279,7 @@ if [[ "$USE_MULTI_DB_NODES" = true ]] ; then
         ]
     }'
 else
-    curl -vvvsSf -X POST localhost:7201/api/v1/placement/init -d '{
+    curl -vvvsSf -X POST localhost:7201/api/v1/services/m3db/placement/init -d '{
         "num_shards": 64,
         "replication_factor": 1,
         "instances": [
@@ -297,12 +297,12 @@ else
 fi
 
 echo "Validating topology"
-[ "$(curl -sSf localhost:7201/api/v1/placement | jq .placement.instances.m3db_seed.id)" == '"m3db_seed"' ]
+[ "$(curl -sSf localhost:7201/api/v1/services/m3db/placement | jq .placement.instances.m3db_seed.id)" == '"m3db_seed"' ]
 echo "Done validating topology"
 
 echo "Waiting until shards are marked as available"
 ATTEMPTS=100 TIMEOUT=2 retry_with_backoff  \
-  '[ "$(curl -sSf 0.0.0.0:7201/api/v1/placement | grep -c INITIALIZING)" -eq 0 ]'
+  '[ "$(curl -sSf 0.0.0.0:7201/api/v1/services/m3db/placement | grep -c INITIALIZING)" -eq 0 ]'
 
 if [[ "$USE_AGGREGATOR" = true ]]; then
     echo "Initializing M3Coordinator topology"

scripts/docker-integration-tests/aggregator/m3coordinator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7202"
+listenAddress: 0.0.0.0:7202
 
 logging:
   level: info

scripts/docker-integration-tests/aggregator_legacy/m3coordinator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7202"
+listenAddress: 0.0.0.0:7202
 
 logging:
   level: info

scripts/docker-integration-tests/carbon/m3coordinator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/docker-integration-tests/cold_writes_simple/m3coordinator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/docker-integration-tests/common.sh

@@ -53,7 +53,7 @@ function setup_single_m3db_node_long_namespaces {
 
   echo "Wait for API to be available"
   ATTEMPTS=100 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq ".namespaces | length")" == "0" ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq ".namespaces | length")" == "0" ]'
 
   echo "Adding placement and agg namespace"
   curl -vvvsSf -X POST 0.0.0.0:${coordinator_port}/api/v1/database/create -d '{
@@ -76,7 +76,7 @@ function setup_single_m3db_node_long_namespaces {
 
   echo "Wait until placement is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/placement | jq .placement.instances.'${dbnode_id}'.id)" == \"'${dbnode_id}'\" ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/placement | jq .placement.instances.'${dbnode_id}'.id)" == \"'${dbnode_id}'\" ]'
 
   wait_for_namespaces
 
@@ -88,7 +88,7 @@ function setup_single_m3db_node_long_namespaces {
 
   echo "Wait until agg2d namespace is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq .registry.namespaces.agg2d.indexOptions.enabled)" == true ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq .registry.namespaces.agg2d.indexOptions.enabled)" == true ]'
 
 
   echo "Wait until bootstrapped"
@@ -106,7 +106,7 @@ function setup_single_m3db_node {
 
   echo "Wait for API to be available"
   ATTEMPTS=100 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq ".namespaces | length")" == "0" ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq ".namespaces | length")" == "0" ]'
 
   echo "Adding placement and agg namespace"
   curl -vvvsSf -X POST 0.0.0.0:${coordinator_port}/api/v1/database/create -d '{
@@ -129,7 +129,7 @@ function setup_single_m3db_node {
 
   echo "Wait until placement is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/placement | jq .placement.instances.'${dbnode_id}'.id)" == \"'${dbnode_id}'\" ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/placement | jq .placement.instances.'${dbnode_id}'.id)" == \"'${dbnode_id}'\" ]'
 
   wait_for_namespaces
 
@@ -150,7 +150,7 @@ function setup_two_m3db_nodes {
 
   echo "Wait for API to be available"
   ATTEMPTS=100 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq ".namespaces | length")" == "0" ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq ".namespaces | length")" == "0" ]'
 
   echo "Adding placement and agg namespace"
   curl -vvvsSf -X POST 0.0.0.0:${coordinator_port}/api/v1/database/create -d '{
@@ -181,7 +181,7 @@ function setup_two_m3db_nodes {
 
   echo "Wait until placement is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/placement | jq .placement.instances.'"${dbnode_id_1}"'.id)" == \"'"${dbnode_id_1}"'\" ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/placement | jq .placement.instances.'"${dbnode_id_1}"'.id)" == \"'"${dbnode_id_1}"'\" ]'
 
   wait_for_namespaces
 
@@ -197,7 +197,7 @@ function wait_for_namespaces {
 
   echo "Wait until agg namespace is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq .registry.namespaces.agg.indexOptions.enabled)" == true ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq .registry.namespaces.agg.indexOptions.enabled)" == true ]'
 
   echo "Adding unagg namespace"
   curl -vvvsSf -X POST 0.0.0.0:${coordinator_port}/api/v1/database/namespace/create -d '{
@@ -207,7 +207,7 @@ function wait_for_namespaces {
 
   echo "Wait until unagg namespace is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq .registry.namespaces.unagg.indexOptions.enabled)" == true ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq .registry.namespaces.unagg.indexOptions.enabled)" == true ]'
 
   echo "Adding coldWritesRepairAndNoIndex namespace"
   curl -vvvsSf -X POST 0.0.0.0:${coordinator_port}/api/v1/services/m3db/namespace -d '{
@@ -233,6 +233,6 @@ function wait_for_namespaces {
 
   echo "Wait until coldWritesRepairAndNoIndex namespace is init'd"
   ATTEMPTS=10 MAX_TIMEOUT=4 TIMEOUT=1 retry_with_backoff  \
-    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/namespace | jq .registry.namespaces.coldWritesRepairAndNoIndex.coldWritesEnabled)" == true ]'
+    '[ "$(curl -sSf 0.0.0.0:'"${coordinator_port}"'/api/v1/services/m3db/namespace | jq .registry.namespaces.coldWritesRepairAndNoIndex.coldWritesEnabled)" == true ]'
 }
 

scripts/docker-integration-tests/coordinator_config_rules/m3coordinator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/docker-integration-tests/coordinator_noop/m3coordinator.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/docker-integration-tests/dedicated_etcd_embedded_coordinator/m3dbnode.yml

@@ -1,6 +1,5 @@
 coordinator:
-  listenAddress:
-    value: "0.0.0.0:7201"
+  listenAddress: 0.0.0.0:7201
 
   logging:
     level: info
@@ -50,11 +49,6 @@ db:
   writeNewSeriesBackoffDuration: 2ms
 
   bootstrap:
-    # Intentionally disable peers bootstrapper to ensure it doesn't interfere with test.
-    bootstrappers:
-        - filesystem
-        - commitlog
-        - uninitialized_topology
     commitlog:
       returnUnfulfilledForCorruptCommitLogFiles: false
 

scripts/docker-integration-tests/multi_cluster_write/m3coordinator-cluster-a.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info

scripts/docker-integration-tests/multi_cluster_write/m3coordinator-cluster-b.yml

@@ -1,5 +1,4 @@
-listenAddress:
-  value: "0.0.0.0:7201"
+listenAddress: 0.0.0.0:7201
 
 logging:
   level: info