enterprise-metrics 2.0.0

enterprise-metrics/CHANGELOG.md

@@ -16,15 +16,29 @@ Entries should include a reference to the Pull Request that introduced the chang
 - [CHANGE] The tokengen configuration is now hidden by default to avoid confusing errors when immutable fields are changed. #541
 - [CHANGE] Arbitrary storage class names are removed from PersistentVolumeClaims. If you were using those storage class names, you will need to configure the storageClassName in the persistentVolume object. For example in `$.ingester.persistentVolumeClaim`. #577
 - [CHANGE] Enabled the self-monitoring feature, which was part of the GEM 1.4 release, by default. #608
+- [CHANGE] Migrate to Grafana Mimir Jsonnet lib in place of Cortex #760
+  - Enable query scheduler by default
+  - Enable query sharding by default
 - [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.3.0](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v130----april-26th-2021). #552
 - [FEATURE] Alertmanager and ruler Kubernetes App manifests are now included. #541
 - [FEATURE] PersistentVolumeClaims can be configured on all components run as a StatefulSet. This includes the alertmanager, compactor, ingester, and store-gateway components. #577
 - [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.4.0](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v140----june-28th-2021). #598
 - [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.4.1](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v141----june-29th-2021). #608
 - [FEATURE] Run the Grafana Enterprise Metrics `overrides-exporter` target as a deployment. #626
 - [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.5.0](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v150----august-24th-2021). #638
+- [FEATURE] Upgrade to [Grafana Enterprise Metrics v2.0.0](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v200----april-13th-2022). #760
+  A few notable changes to defaults have been made in GEM 2.0. Consider whether you are currently relying on any of the following defaults before upgrading:
+  - Default HTTP port for all components and services has changed to 8080 (from 80)
+  - blocks_storage.backend used to be s3, but is now filesystem
+  - server.http_listen_port used to be 80 but is now 8080
+  - auth.type used to be trust, but is now enterprise
+  - ruler_storage.backend used to be s3 but is now filesystem
+  - alertmanager_storage.backend used to be s3 but is now filesystem
+  - See [GEM 2.0 release notes](https://grafana.com/docs/enterprise-metrics/latest/release-notes/v2-0/) for more information
+- [FEATURE] Add memcached for frontend cache #760
+- [ENHANCEMENT] Make Secret name for GEM license configurable via `licenseSecretName` #760
+- [ENHANCEMENT] Make Secret name for GEM admin token configurable via `adminTokenSecretName`. #600
 - [BUGFIX] The `gossip-ring` Service now publishes not ready addresses. #523
-- [ENHANCEMENT] Make Secret name for GEM admin token configurable via `adminTokenSecretName`. #600- [BUGFIX] The `gossip-ring` Service now publishes not ready addresses. #523
 - [BUGFIX] All ring members now have the `gossip_ring-member` label set. #523
 - [BUGFIX] All microservices now use the `gossip-ring` Service as `memberlist.join` address. #523
 - [BUGFIX] Enable admin-api leader election. This change does not affect single replica deployments of the admin-api but does fix the potential for an inconsistent state when running with multiple replicas of the admin-api and experiencing parallel writes for the same objects.

enterprise-metrics/Makefile

@@ -17,8 +17,7 @@ vendor: jsonnetfile.json jsonnetfile.lock.json
 
 test/vendor: ## Vendor the test Jsonnet libraries.
 test/vendor: test/jsonnetfile.json test/jsonnetfile.lock.json
-	cd test
-	jb install
+	cd test; jb install
 
 .PHONY: test
 test: ## Run library tests.
@@ -36,8 +35,7 @@ environments/minio/jsonnetfile.json: environments/minio/jsonnetfile.jsonnet json
 
 environments/minio/vendor: ## Vendor environment dependencies.
 environments/minio/vendor: environments/minio/jsonnetfile.json
-	cd $(@D)
-	jb install
+	cd $(@D); jb install
 
 .PHONY: local-test
 local-test: ## Deploy GEM to a local k3d cluster. Tear down with ./scripts/k3d-cluster delete.

enterprise-metrics/environments/minio/jsonnetfile.json

@@ -3,20 +3,20 @@
       {
          "source": {
             "git": {
-               "remote": "https://github.com/grafana/cortex-jsonnet.git",
-               "subdir": "cortex"
+               "remote": "https://github.com/grafana/jsonnet-libs.git",
+               "subdir": "ksonnet-util"
             }
          },
-         "version": "1.9.0"
+         "version": "master"
       },
       {
          "source": {
             "git": {
-               "remote": "https://github.com/grafana/jsonnet-libs.git",
-               "subdir": "ksonnet-util"
+               "remote": "https://github.com/grafana/mimir.git",
+               "subdir": "operations/mimir"
             }
          },
-         "version": "master"
+         "version": "mimir-2.0.0"
       },
       {
          "source": {
@@ -30,11 +30,11 @@
       {
          "source": {
             "git": {
-               "remote": "https://github.com/jsonnet-libs/k8s-alpha.git",
+               "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
                "subdir": "1.18"
             }
          },
-         "version": "master"
+         "version": "main"
       }
    ],
    "legacyImports": true,

enterprise-metrics/environments/minio/lib/k.libsonnet

@@ -1,2 +1 @@
-(import 'github.com/jsonnet-libs/k8s-alpha/1.18/main.libsonnet')
-+ (import 'github.com/jsonnet-libs/k8s-alpha/1.18/extensions/kausal-shim.libsonnet')
+(import 'github.com/jsonnet-libs/k8s-libsonnet/1.18/main.libsonnet')

enterprise-metrics/environments/minio/main.jsonnet

@@ -70,7 +70,7 @@ function(kubeconfig) {
                'admin.client.s3.endpoint': data.minio.service.metadata.name + ':' + minioPort,
                'admin.client.s3.insecure': 'true',
                'admin.client.s3.secret-access-key': minioSecretKey,
-               'auth.type': 'default',
+               'auth.type': 'trust',
                'blocks-storage.backend': 's3',
                'blocks-storage.s3.access-key-id': minioAccessKey,
                'blocks-storage.s3.bucket-name': tsdbBucket,
@@ -94,6 +94,7 @@ function(kubeconfig) {
            },
 
            memcached+: {
+             frontend+: { statefulSet+: { spec+: { replicas: 1 } } },
              chunks+: { statefulSet+: { spec+: { replicas: 1 } } },
              metadata+: { statefulSet+: { spec+: { replicas: 1 } } },
              queries+: { statefulSet+: { spec+: { replicas: 1 } } },

enterprise-metrics/jsonnetfile.json

@@ -4,20 +4,20 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/cortex-jsonnet.git",
-          "subdir": "cortex"
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "ksonnet-util"
         }
       },
-      "version": "1.9.0"
+      "version": "master"
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "ksonnet-util"
+          "remote": "https://github.com/grafana/mimir.git",
+          "subdir": "operations/mimir"
         }
       },
-      "version": "master"
+      "version": "mimir-2.0.0"
     },
     {
       "source": {

enterprise-metrics/jsonnetfile.lock.json

@@ -1,16 +1,6 @@
 {
   "version": 1,
   "dependencies": [
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/grafana/cortex-jsonnet.git",
-          "subdir": "cortex"
-        }
-      },
-      "version": "20d37d030eb5b526d06e1e89e86ef9c8adf22046",
-      "sum": "ZkhPhfB9jaqq1wNU/A7lKfuEjVSdgP8M/HOeXhKxr7c="
-    },
     {
       "source": {
         "git": {
@@ -61,6 +51,16 @@
       "version": "a3b9f8e29c36ab50df57cf9c9410e231d8481899",
       "sum": "dTOeEux3t9bYSqP2L/uCuLo/wUDpCKH4w+4OD9fePUk="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/mimir.git",
+          "subdir": "operations/mimir"
+        }
+      },
+      "version": "99c90795b497ea372d0cdebfd0e6d69d23e1063e",
+      "sum": "MhA3qnMbcM4zi+hHPSrn+QbCoathsgcpzC2dDZy8C7I="
+    },
     {
       "source": {
         "git": {