Update to latest (#184)

* [v9.3.x] OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth (grafana#58940) OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth (grafana#58782) * Add ApprovalForce to AuthCodeOptions * Extract access token validity check to a function * Refactor * Oauth: set options internally instead of exposing new function * Align tests * Remove unused function Co-authored-by: Karl Persson <[email protected]> (cherry picked from commit 9c98314) Co-authored-by: Misi <[email protected]> * [v9.3.x] Preferences: Add confirmation modal when saving org preferences (grafana#59119) (grafana#59141) * Navigation: share logic between `buildBreadcrumbs` and `usePageTitle`… (grafana#59155) Navigation: share logic between `buildBreadcrumbs` and `usePageTitle` (grafana#58819) * simplify usePageTitle logic a bit * use buildBreadcrumbs logic in usePageTitle * always add home item to navTree, fix some tests * fix remaining unit tests (cherry picked from commit 824a562) * [v9.3.x] CloudWatch: Cross-account querying support (grafana#59389) * add cross-account querying support * fix tests * FN FluxNinja changes * Run `go mod tidy` * Fix druid plugin registration * FN FluxNinja changes * FN FluxNinja changes * Build: Streamline and sync dockerfiles (grafana#58101) * streamline and sync dockerfiles * improve go dependency cacheability * unify alpine and ubuntu Dockerfiles * include glibc support in locally-built alpine images * FN Remove internationalization provider * FN Update sankey panel (30b5be0b5bf03ee8c7) * FN Render filters and time selector, hide loader despite pageNav and sectionNav * FN Remove tenary expressions with explicit booleans in DashNav * FN Use optional chaining - keybindingSrv in initDashboard * FN Set isPublicDashboardView to false * FN Set hiddenVariables in initial FN state * FN Lint RenderFnDashboard * FN Lint create-mfe * Updated SSH Keys (#43) * Time range selector changes (#42) * changed time picker dropdown designs * change time setting button * added dark and light * 7829 Read hiddenVariables, mode, FNDashboard from grfana's state (#44) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * Add tool versions (#45) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * Added support for updating nightly environment (#46) * 7911 Add graphql datasource plugin (#47) * 7911 Update FN_README * 7911 Add graphql plugin * 7911 Add graphql plugin Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * 7911 Allow loading unsigned graphql plugin (#49) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * 7911 Modify url in graphql datasource plugin (#50) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * Minor grafadruid fixes (#51) * Support Druid GroupBy queries (#52) * 8225 Fix missing grafana loader (#53) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * Fix ad hoc filters (#54) * 8238 Remove panel header menu (#55) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * added presisted time range (#56) * Updates to latest instead of demo environment (#57) * Loading dashboards with update function (#58) * changed dashboard loading to use update fn * removed extra package * changed query filter designs (#59) * Add ChatGPT-based PR Reviewer and Summarizer (#62) * fix (#63) * 8822 ci (#66) * 8822 Remove dashes from dashboard filter labels * 8822 Empty commit --------- Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * 8740 Fix variables in titles by using PanelHeader component to render panel header (#64) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * update action * update review job name (#69) * Load dashboard with specific version passed from FN UI (#68) * Add full metadata for versions query too (#70) * 8963 Remove edit icons in dashboard row (#71) Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> * Update openai-review.yml (#73) * Update openai-review.yml * update action * Fix table panel (#75) * Grafana firefox (#77) * vscode fix * fixed firefox bugs --------- Co-authored-by: Gurinder Singh <[email protected]> * Pull latest time range changes from upstream grafana (#78) * Support math expressions for druid granularity (#81) * Remove font size from global styles (#82) * Add fnLoader in grafana instead of prop from parent mfe (#83) * Fixed CircleCI config (#84) * Font update, bug fixes (#85) * Fix grafana bugs * Update grafana font to source sans pro * Revert code format change * replace function error fix (#87) * Add missing config in opsninja.yaml (#88) * Update font to Source Sans Pro (#90) * filter label design fix (#92) * druid datasource fixes (#93) * druid datasource fixes * wire gen fix * page definations fix (#94) * Fix headers in Druid DS (#97) Co-authored-by: Jakub Michalak <[email protected]> * Pass headers to Druid query (#99) * Fix headers in Druid variable queries (#100) * typing error fix and modifications (#101) * typing error fix and modifications * react-use module installed * Fix type error and adhoc filter alignment * Fix one more type error --------- Co-authored-by: Spikatrix <[email protected]> * render time range selector any where, removed dead code (#103) * removed graphql data source, updated local test info in fn readme * portal for time range selector * Enable panel resizing (#105) * Adhoc filter fix, update sankey plugin (#106) * Adhoc filter style fix * Update sankey plugin * confirm grafana initialization (#107) * window event to confirm initialization * grafana start up status events * Show filters icon only when there are some variables to show (#116) * Don't panic on empty var Druid query (#123) * Remove not needed GH Actions (#124) * changed to cirular progress (#148) * changed to cirular progress * codeRabbit suggestions * remove reviewer * loader color fix (#150) * page title Flux Ninja -> FluxNinja * Add allowed cookies field in druid datasource settings (#171) * Fix sentry heatmap crash (#168) Co-authored-by: Gurinder Singh <[email protected]> * removed make doc workflow (#172) * Coderabbit theme and fixes (#175) * coderabbit theme * theme change * checkpoint * fixes * added coderabbit authentication * Create deploy-cloud-run-grafana.yaml (#176) * Update deploy-cloud-run-grafana.yaml * Update deploy-cloud-run-grafana.yaml with CD * webpack fix for prod (#177) * added GH for prod (#178) Co-authored-by: dikshant <[email protected]> * Deploy grafana image to cloud run * Update deploy-cloud-run-grafana-prod.yaml * dashboard style changes (#179) * disabled drag for mfe (#180) * changed error message to no data (#182) * fix * log fix * rebase issues resolved * webpack changes * mfe fix * checkpoint * tooltip, icons fix * deleted github actions * dependency updates fix * fixes --------- Co-authored-by: Grot (@grafanabot) <[email protected]> Co-authored-by: Misi <[email protected]> Co-authored-by: Joao Silva <[email protected]> Co-authored-by: Ashley Harrison <[email protected]> Co-authored-by: Erik Sundell <[email protected]> Co-authored-by: Katarzyna Ziomek-Zdanowicz <[email protected]> Co-authored-by: Krzysztof Kwapisiewicz <[email protected]> Co-authored-by: Dan Cech <[email protected]> Co-authored-by: Hardik Shingala <[email protected]> Co-authored-by: Gurinder Singh <[email protected]> Co-authored-by: Kasia <[email protected]> Co-authored-by: Szymon Bieńkowski <[email protected]> Co-authored-by: Jakub Michalak <[email protected]> Co-authored-by: Harjot Gill <[email protected]> Co-authored-by: Daria Bialobrzeska <[email protected]> Co-authored-by: Gurinder Singh <[email protected]> Co-authored-by: Jaseel <[email protected]> Co-authored-by: Gurinder Singh <[email protected]> Co-authored-by: dikshant-infracloud <[email protected]> Co-authored-by: dikshant <[email protected]>
coderabbitai · Sep 3, 2024 · 68b353a · 68b353a
1 parent 4755eb5
commit 68b353a
Show file tree

Hide file tree

Showing 472 changed files with 18,067 additions and 10,757 deletions.
diff --git a/.betterer.results b/.betterer.results
@@ -1296,11 +1296,7 @@ exports[`better eslint`] = {
     ],
     "public/app/core/services/backend_srv.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/core/services/context_srv.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -3103,9 +3099,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "7"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "8"]
     ],
-    "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
     "public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx:5381": [
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "1"],

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,276 @@
+version: 2.1
+
+# this allows to use CircleCI's dynamic configuration feature
+setup: true
+
+orbs:
+  gcp-gcr: circleci/[email protected]
+
+executors:
+  base-cimg-executor:
+    docker:
+      - image: cimg/base:2022.07
+  python-cimg-executor:
+    docker:
+      - image: cimg/python:3.10.4
+
+commands:
+  asdf_install:
+    description: "Install tools using ASDF"
+    parameters:
+      tools:
+        type: string
+        description:
+          "Newline separated list of tools to install. If empty, will install
+          everything."
+        default: ""
+      cache_name:
+        type: string
+        description: "Name of asdf cache"
+        default: "default"
+    steps:
+      - run:
+          name: Install ASDF
+          command: |
+            git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.10.2
+            printf '\nsource "${HOME}/.asdf/asdf.sh"\n' >> "${BASH_ENV}"
+            date +%m > ~/month
+            date +%d > ~/day
+      # We need to restore ASDF cache after installing, otherwise we will try to clone it to non-empty dir
+      - restore_cache:
+          name: Restore ASDF cache
+          keys:
+            - grafana-asdf-cache-v7-{{ checksum "~/month" }}-<<
+              parameters.cache_name >>-{{ checksum ".tool-versions" }}
+            - grafana-asdf-cache-v7-{{ checksum "~/month" }}-<<
+              parameters.cache_name >>-
+      - run:
+          name: Install ASDF tools
+          environment:
+            TOOLS: << parameters.tools >>
+          command: .circleci/scripts/asdf_install.sh
+  asdf_save_cache:
+    parameters:
+      cache_name:
+        type: string
+        description: "Name of asdf cache"
+        default: "default"
+    steps:
+      - save_cache:
+          name: Save ASDF cache
+          key:
+            grafana-asdf-cache-v7-{{ checksum "~/month" }}-<<
+            parameters.cache_name >>-{{ checksum ".tool-versions" }}
+          paths:
+            - ~/.asdf
+  opsninja_install:
+    parameters:
+      branch:
+        type: string
+        default: main
+        description: opsninja branch to install from
+      fingerprint:
+        type: string
+        default: 10:d1:92:4e:2a:55:81:c9:82:c2:74:ce:6d:0e:e8:a8  # fluxninja/cloud R/O
+        description: What SSH identity to use for accessing opsninja repository
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - << parameters.fingerprint >>
+      - run:
+          name: Install opsninja and its dependencies
+          command: |
+            # We need R/O access to cloud repository to be able to fetch opsninja library
+            # FIXME: make "releases" of opsninja library somehow, even as a separate repository
+            # to limit exposure.
+            export CLOUD_RO_KEY_FINGERPRINT="<< parameters.fingerprint >>"
+            export GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa_$(echo "${CLOUD_RO_KEY_FINGERPRINT}" | tr -d ':')"
+            export SSH_AUTH_SOCK=""
+            # Bust asdf cache as our opsninja version is always 0.0.0
+            pip uninstall -y opsninja
+            pip install 'git+ssh://[email protected]/fluxninja/cloud@<< parameters.branch >>#egg=opsninja&subdirectory=ops/apps/opsninja/'
+            which asdf > /dev/null 2>&1 && asdf reshim
+
+jobs:
+  release-components:
+    executor: base-cimg-executor
+    steps:
+      - checkout
+      - asdf_install:
+          cache_name: release
+          tools: |-
+            python
+            gcloud
+      - opsninja_install
+      - run:
+          name: Schedule release jobs
+          working_directory: ops/apps/opsninja
+          command: fn circleci trigger-release --tag << pipeline.git.tag >>
+      - asdf_save_cache:
+          cache_name: release
+  build-push-add-tag:
+    parameters:
+      attach-workspace:
+        type: boolean
+        description: Boolean for whether or not to attach to an existing workspace
+        default: false
+      docker-context:
+        type: string
+        description: Path to the directory containing your build context, defaults to .
+        default: .
+      dockerfile:
+        type: string
+        description: Name of dockerfile to use, defaults to Dockerfile
+        default: Dockerfile
+      executor:
+        type: executor
+        description: executor to use for this job
+        default: base-cimg-executor
+      extra_build_args:
+        type: string
+        description: Extra flags to pass to docker build
+        default: ""
+      image:
+        type: string
+        description: A name for your Docker image
+      path:
+        type: string
+        description: Path to the directory containing your Dockerfile, defaults to .
+        default: .
+      remote-docker-version:
+        type: string
+        description: Specify the remote docker version
+        default: 20.10.14
+      setup-remote-docker:
+        type: boolean
+        description: Setup and use CircleCI's remote Docker environment
+        default: true
+      tag:
+        type: string
+        description: A Docker image tag
+        default: ${CIRCLE_SHA1:0:8}
+      target-tag:
+        type: string
+        description: Additional image tag applied when job runs on fluxninja_micro_frontends branch
+        default: latest
+      use-docker-layer-caching:
+        type: boolean
+        description: Setup docker layer caching for optimized build
+        default: false
+      workspace-root:
+        type: string
+        description: >
+          Workspace root path that is either an absolute path or a path relative
+          to the working directory. Defaults to '.' (the working directory)
+        default: .
+    executor: <<parameters.executor>>
+    environment:
+      DOCKER_BUILDKIT: 1
+    steps:
+      - checkout
+      - when:
+          condition: <<parameters.setup-remote-docker>>
+          steps:
+            - setup_remote_docker:
+                docker_layer_caching: <<parameters.use-docker-layer-caching>>
+                version: <<parameters.remote-docker-version>>
+      - gcp-gcr/gcr-auth
+      - gcp-gcr/build-image:
+          attach-workspace: <<parameters.attach-workspace>>
+          docker-context: <<parameters.docker-context>>
+          dockerfile: <<parameters.dockerfile>>
+          extra_build_args: <<parameters.extra_build_args>>
+          image: <<parameters.image>>
+          path: <<parameters.path>>
+          tag: <<parameters.tag>>
+          workspace-root: <<parameters.workspace-root>>
+      - gcp-gcr/push-image:
+          image: <<parameters.image>>
+          tag: <<parameters.tag>>
+      - when:
+          condition:
+            equal: [coderabbit_micro_frontend, << pipeline.git.branch >>]
+          steps:
+            - gcp-gcr/tag-image:
+                image: <<parameters.image>>
+                source-tag: <<parameters.tag>>
+                target-tag: <<parameters.target-tag>>
+  update-environment:
+    parameters:
+      job-root:
+        type: string
+        default: "/home/circleci"
+        description: The root folder of the job where all repositories will be cloned to
+      manifests-repo:
+        type: string
+        default: [email protected]:fluxninja/argo-manifests.git
+        description: ArgoCD manifests repository to update
+      manifests-branch:
+        type: string
+        default: environments/latest
+        description: Branch to use when pushing deployment changes
+      environment-path:
+        type: string
+        description: Path to the environment to update
+      component:
+        type: string
+        default: ""
+        description: Application component to update image and deployment code for
+      update:
+        type: string
+        default: everything
+        description: Whether to update 'images', 'deployment-code' or 'everything'
+    executor: python-cimg-executor
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "f9:49:04:10:b1:77:16:b0:0e:c0:ba:21:0e:9d:fd:40"  # argo-manifests R/W
+      - checkout
+      - asdf_install:
+          cache_name: release
+          tools: |-
+            python
+            gcloud
+      - gcp-gcr/gcr-auth
+      - opsninja_install
+      - run:
+          name: Update application in the deployment
+          environment:
+            JOB_ROOT: << parameters.job-root >>
+            UPDATE: << parameters.update >>
+            MANIFESTS_BRANCH: << parameters.manifests-branch >>
+            MANIFESTS_REPO: << parameters.manifests-repo >>
+            COMPONENT: << parameters.component >>
+            ENVIRONMENT_PATH: << parameters.environment-path >>
+          command: .circleci/scripts/update_environment.sh
+
+workflows:
+  version: 2
+  build-alpine:
+    jobs:
+      - build-push-add-tag:
+          name: image-build-grafana-alpine
+          image: cf-fn/grafana
+      - update-environment:
+          name: update-demo-environment
+          filters:
+            branches:
+              only:
+                - coderabbit_micro_frontend
+          requires:
+            - image-build-grafana-alpine
+          environment-path: environments/latest/
+          component: grafana
+          update: images
+
+  release-components:
+    when:
+      matches: { value: << pipeline.git.tag >>, pattern: "^releases/.+$" }
+    jobs:
+      - release-components:
+          # both this and workflow's when is needed
+          filters:
+            branches:
+              ignore: /.+/
+            tags:
+              only: /releases\/.+/
diff --git a/.circleci/scripts/asdf_install.sh b/.circleci/scripts/asdf_install.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -euo pipefail
+set -x
+
+# shellcheck disable=SC2153
+readarray -t tools <<<"${TOOLS?}"
+if [ "${#tools[@]}" -eq 1 ] && [ -z "${tools[0]:-}" ]; then
+	# Parameter was set to empty string
+	tools=()
+fi
+
+sudo apt-get update
+sudo apt-get install graphviz
+
+# If we need to setup python
+if grep <<<"${TOOLS}" '^python$'; then
+	# See https://github.com/pyenv/pyenv/wiki#suggested-build-environment
+	sudo apt-get install make build-essential libssl-dev zlib1g-dev \
+		libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
+		libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
+fi
+
+(yes || true) | ./.circleci/scripts/manage_tools.sh setup "${tools[@]}"