Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest #184

Merged
merged 101 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from 93 commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
0e1e4c7
[v9.3.x] OAuth: Refactor OAuth parameters handling to support obtaini…
grafanabot Nov 18, 2022
f1f2ef2
[v9.3.x] Preferences: Add confirmation modal when saving org preferen…
JoaoSilvaGrafana Nov 22, 2022
fa9a050
Navigation: share logic between `buildBreadcrumbs` and `usePageTitle`…
ashharrison90 Nov 23, 2022
e08d563
[v9.3.x] CloudWatch: Cross-account querying support (#59389)
sunker Nov 28, 2022
fc21106
FN FluxNinja changes
Jan 3, 2023
d0f4691
Run `go mod tidy`
kwapik Jan 3, 2023
1c48135
Fix druid plugin registration
kwapik Jan 3, 2023
ded51d2
FN FluxNinja changes
Jan 3, 2023
f4da5d3
FN FluxNinja changes
Jan 3, 2023
6c5d70c
Build: Streamline and sync dockerfiles (#58101)
DanCech Nov 28, 2022
e014d60
FN Remove internationalization provider
Jan 4, 2023
85f9ab8
FN Update sankey panel (30b5be0b5bf03ee8c7)
Jan 5, 2023
1a9457a
FN Render filters and time selector, hide loader despite pageNav and …
Jan 5, 2023
6fc2858
FN Remove tenary expressions with explicit booleans in DashNav
Jan 5, 2023
142eb12
FN Use optional chaining - keybindingSrv in initDashboard
Jan 5, 2023
1052c6b
FN Set isPublicDashboardView to false
Jan 5, 2023
8db6785
FN Set hiddenVariables in initial FN state
Jan 5, 2023
1fca5cd
FN Lint RenderFnDashboard
Jan 5, 2023
19300d8
FN Lint create-mfe
Jan 5, 2023
1e381d6
Updated SSH Keys (#43)
hdkshingala Jan 10, 2023
82e642b
Time range selector changes (#42)
gurinder39 Jan 12, 2023
867df86
7829 Read hiddenVariables, mode, FNDashboard from grfana's state (#44)
ziomecka Jan 16, 2023
ddde796
Add tool versions (#45)
ziomecka Jan 17, 2023
c646c86
Added support for updating nightly environment (#46)
hdkshingala Jan 19, 2023
b4ed458
7911 Add graphql datasource plugin (#47)
ziomecka Jan 19, 2023
ce49033
7911 Allow loading unsigned graphql plugin (#49)
ziomecka Jan 20, 2023
f83d7c1
7911 Modify url in graphql datasource plugin (#50)
ziomecka Jan 20, 2023
08dfa17
Minor grafadruid fixes (#51)
sbienkow-ninja Feb 2, 2023
ebee848
Support Druid GroupBy queries (#52)
jmichalak-fluxninja Feb 3, 2023
2ceb550
8225 Fix missing grafana loader (#53)
ziomecka Feb 7, 2023
7eee066
Fix ad hoc filters (#54)
kwapik Feb 7, 2023
bbca583
8238 Remove panel header menu (#55)
ziomecka Feb 7, 2023
3ed3769
added presisted time range (#56)
gurinder39 Feb 15, 2023
366cb22
Updates to latest instead of demo environment (#57)
hdkshingala Feb 17, 2023
7caf019
Loading dashboards with update function (#58)
gurinder39 Feb 23, 2023
26f66bb
changed query filter designs (#59)
gurinder39 Mar 6, 2023
7dd84a1
Add ChatGPT-based PR Reviewer and Summarizer (#62)
harjotgill Mar 12, 2023
81f4585
fix (#63)
gurinder39 Mar 16, 2023
5d28b7e
8822 ci (#66)
ziomecka Mar 16, 2023
f8f148b
8740 Fix variables in titles by using PanelHeader component to render…
ziomecka Mar 16, 2023
f5eba7b
update action
harjotgill Mar 18, 2023
47b3c38
update review job name (#69)
harjotgill Mar 20, 2023
e25071a
Load dashboard with specific version passed from FN UI (#68)
DariaKunoichi Mar 24, 2023
781e41e
Add full metadata for versions query too (#70)
DariaKunoichi Mar 28, 2023
b24a43d
8963 Remove edit icons in dashboard row (#71)
ziomecka Mar 30, 2023
8c001df
Update openai-review.yml (#73)
harjotgill Apr 8, 2023
61624fb
Update openai-review.yml
harjotgill Apr 12, 2023
2fd0c99
update action
harjotgill Apr 20, 2023
0b92d08
Fix table panel (#75)
kwapik May 26, 2023
dc64413
Grafana firefox (#77)
gurinder39 Jun 16, 2023
668b06b
Pull latest time range changes from upstream grafana (#78)
Spikatrix Jun 19, 2023
dbef786
Support math expressions for druid granularity (#81)
jmichalak-fluxninja Jun 20, 2023
6d861cb
Remove font size from global styles (#82)
Spikatrix Aug 30, 2023
0c2d5d4
Add fnLoader in grafana instead of prop from parent mfe (#83)
Spikatrix Aug 31, 2023
3daf0e9
Fixed CircleCI config (#84)
hdkshingala Sep 1, 2023
2b72716
Font update, bug fixes (#85)
Spikatrix Sep 18, 2023
1d7e71c
replace function error fix (#87)
gurinder39 Oct 6, 2023
7d4802c
Add missing config in opsninja.yaml (#88)
hdkshingala Oct 6, 2023
6d8b336
Update font to Source Sans Pro (#90)
Spikatrix Oct 12, 2023
957cf1e
filter label design fix (#92)
gurinder39 Oct 13, 2023
7d0b760
druid datasource fixes (#93)
gurinder39 Oct 14, 2023
719e663
page definations fix (#94)
gurinder39 Oct 14, 2023
d4c37c4
Fix headers in Druid DS (#97)
kwapik Oct 17, 2023
4599a64
Pass headers to Druid query (#99)
kwapik Oct 17, 2023
10a214e
Fix headers in Druid variable queries (#100)
kwapik Oct 17, 2023
979264a
typing error fix and modifications (#101)
gurinder39 Oct 18, 2023
7380d83
render time range selector any where, removed dead code (#103)
gurinder39 Oct 19, 2023
931022c
Enable panel resizing (#105)
Spikatrix Oct 19, 2023
15c970b
Adhoc filter fix, update sankey plugin (#106)
Spikatrix Oct 19, 2023
d47ffa6
confirm grafana initialization (#107)
gurinder39 Oct 20, 2023
b4b4843
Show filters icon only when there are some variables to show (#116)
Spikatrix Nov 1, 2023
819b0ba
Don't panic on empty var Druid query (#123)
kwapik Nov 8, 2023
32adca5
Remove not needed GH Actions (#124)
kwapik Nov 8, 2023
dd21937
changed to cirular progress (#148)
gurinder39 Dec 11, 2023
60eccc2
remove reviewer
harjotgill Dec 12, 2023
f200422
loader color fix (#150)
gurinder39 Dec 12, 2023
8e00f77
page title Flux Ninja -> FluxNinja
harjotgill Dec 21, 2023
83184f2
Add allowed cookies field in druid datasource settings (#171)
Spikatrix Jan 8, 2024
a2883dd
Fix sentry heatmap crash (#168)
Spikatrix Jan 8, 2024
2ce8ced
removed make doc workflow (#172)
gurinder39 Jan 9, 2024
0306b49
Coderabbit theme and fixes (#175)
GurinderRawala Jul 15, 2024
f869cab
Create deploy-cloud-run-grafana.yaml (#176)
dikshant-infracloud Jul 24, 2024
b34f792
Update deploy-cloud-run-grafana.yaml
dikshant-infracloud Jul 24, 2024
044a720
Update deploy-cloud-run-grafana.yaml with CD
dikshant-infracloud Jul 24, 2024
0fcbc58
webpack fix for prod (#177)
GurinderRawala Aug 1, 2024
64f0dc5
added GH for prod (#178)
dikshant-infracloud Aug 1, 2024
da4aad9
Deploy grafana image to cloud run
dikshant-infracloud Aug 1, 2024
732f208
Update deploy-cloud-run-grafana-prod.yaml
dikshant-infracloud Aug 1, 2024
81b96c2
dashboard style changes (#179)
GurinderRawala Aug 8, 2024
2a0d73e
disabled drag for mfe (#180)
GurinderRawala Aug 9, 2024
26f25e6
changed error message to no data (#182)
GurinderRawala Aug 12, 2024
355ae05
fix
GurinderRawala Aug 27, 2024
6e8d154
log fix
GurinderRawala Aug 27, 2024
8dbef0c
rebase issues resolved
GurinderRawala Aug 29, 2024
d1bea19
webpack changes
GurinderRawala Aug 29, 2024
ea40d07
mfe fix
GurinderRawala Aug 30, 2024
67305b3
checkpoint
GurinderRawala Sep 2, 2024
3b25e72
tooltip, icons fix
GurinderRawala Sep 3, 2024
f9c89a0
deleted github actions
GurinderRawala Sep 3, 2024
9f1a95d
dependency updates fix
GurinderRawala Sep 3, 2024
34384b4
fixes
GurinderRawala Sep 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 2 additions & 6 deletions .betterer.results
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// BETTERER RESULTS V2.
//
//
// If this file contains merge conflicts, use `betterer merge` to automatically resolve them:
// https://phenomnomnominal.github.io/betterer/docs/results-file/#merge
//
Expand Down Expand Up @@ -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"],
Expand Down
276 changes: 276 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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: [fluxninja_micro_frontends, << 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:
- fluxninja_micro_frontends
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\/.+/
23 changes: 23 additions & 0 deletions .circleci/scripts/asdf_install.sh
Original file line number Diff line number Diff line change
@@ -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[@]}"
Loading
Loading