Merge pull request #26 from friedrichg/use-cortexproject-mixin

Use new cortexproject mixin
monitoring-mixins · Oct 30, 2023 · 3fa58af · 3fa58af
2 parents 085c6a9 + c47f671
commit 3fa58af
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/assets/cortex/dashboards/cortex-queries.json b/assets/cortex/dashboards/cortex-queries.json
@@ -599,7 +599,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "sum(rate(cortex_cache_hits{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) / sum(rate(cortex_cache_fetched_keys{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m]))",
+                     "expr": "sum(rate(cortex_cache_hits{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) / sum(rate(cortex_cache_fetched_keys{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) or\nsum(rate(cortex_cache_hits_total{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) / sum(rate(cortex_cache_fetched_keys_total{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m]))\n",
                      "format": "time_series",
                      "interval": "15s",
                      "intervalFactor": 2,
@@ -676,7 +676,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "sum(rate(cortex_cache_fetched_keys{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) - sum(rate(cortex_cache_hits{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m]))",
+                     "expr": "sum(rate(cortex_cache_fetched_keys{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) - sum(rate(cortex_cache_hits{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) or\nsum(rate(cortex_cache_fetched_keys_total{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m])) - sum(rate(cortex_cache_hits_total{name=~\"frontend.+\", cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\"}[1m]))\n",
                      "format": "time_series",
                      "interval": "15s",
                      "intervalFactor": 2,
@@ -1028,7 +1028,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "sum(rate(cortex_cache_fetched_keys{cluster=~\"$cluster\", job=~\"($namespace)/(querier.*|cortex$)\",name=\"chunksmemcache\"}[1m])) - sum(rate(cortex_cache_hits{cluster=~\"$cluster\", job=~\"($namespace)/(querier.*|cortex$)\",name=\"chunksmemcache\"}[1m]))",
+                     "expr": "sum(rate(cortex_cache_fetched_keys{cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\",name=\"chunksmemcache\"}[1m])) - sum(rate(cortex_cache_hits{cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\",name=\"chunksmemcache\"}[1m])) or\nsum(rate(cortex_cache_fetched_keys_total{cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\",name=\"chunksmemcache\"}[1m])) - sum(rate(cortex_cache_hits_total{cluster=~\"$cluster\", job=~\"($namespace)/(query-frontend.*|cortex$)\",name=\"chunksmemcache\"}[1m]))\n",
                      "format": "time_series",
                      "interval": "15s",
                      "intervalFactor": 2,

diff --git a/mixins.json b/mixins.json
@@ -76,7 +76,7 @@
         },
         {
             "name": "cortex",
-            "source": "https://github.com/grafana/cortex-jsonnet",
+            "source": "https://github.com/cortexproject/cortex-jsonnet",
             "subdir": "cortex-mixin"
         },
         {

diff --git a/site/content/cortex/_index.md b/site/content/cortex/_index.md
@@ -7,7 +7,7 @@ title: cortex
 
 
 {{< panel style="danger" >}}
-Jsonnet source code is available at [github.com/grafana/cortex-jsonnet](https://github.com/grafana/cortex-jsonnet/tree/master/cortex-mixin)
+Jsonnet source code is available at [github.com/cortexproject/cortex-jsonnet](https://github.com/cortexproject/cortex-jsonnet/tree/master/cortex-mixin)
 {{< /panel >}}
 
 ## Alerts

diff --git a/site/static/mixins.json b/site/static/mixins.json
@@ -76,7 +76,7 @@
         },
         {
             "name": "cortex",
-            "source": "https://github.com/grafana/cortex-jsonnet",
+            "source": "https://github.com/cortexproject/cortex-jsonnet",
             "subdir": "cortex-mixin"
         },
         {