Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 68b353a

Browse files
GurinderRawalagrafanabotmgyongyosiJoaoSilvaGrafanaashharrison90
authored
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 <kalle.persson@grafana.com> (cherry picked from commit 9c98314) Co-authored-by: Misi <mgyongyosi@users.noreply.github.com> * [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 <katarzyna.ziomek-zdanowicz@fluxninja.com> * Add tool versions (#45) Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> * 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 <katarzyna.ziomek-zdanowicz@fluxninja.com> * 7911 Allow loading unsigned graphql plugin (#49) Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> * 7911 Modify url in graphql datasource plugin (#50) Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> * Minor grafadruid fixes (#51) * Support Druid GroupBy queries (#52) * 8225 Fix missing grafana loader (#53) Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> * Fix ad hoc filters (#54) * 8238 Remove panel header menu (#55) Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> * 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 <katarzyna.ziomek-zdanowicz@fluxninja.com> * 8740 Fix variables in titles by using PanelHeader component to render panel header (#64) Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> * 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 <katarzyna.ziomek-zdanowicz@fluxninja.com> * 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 <gurnder.rawala@fluxninja.com> * 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 <jakub.michalak@fluxninja.com> * 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 <12792882+Spikatrix@users.noreply.github.com> * 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 <gurinder.rawala@fluxninja.com> * 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 <raidikshant2@gmail.com> * 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) <43478413+grafanabot@users.noreply.github.com> Co-authored-by: Misi <mgyongyosi@users.noreply.github.com> Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com> Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com> Co-authored-by: Erik Sundell <erik.sundell87@gmail.com> Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com> Co-authored-by: Krzysztof Kwapisiewicz <krzysztof.kwapisiewicz@fluxninja.com> Co-authored-by: Dan Cech <dcech@grafana.com> Co-authored-by: Hardik Shingala <34568645+hdkshingala@users.noreply.github.com> Co-authored-by: Gurinder Singh <108446046+gurinder39@users.noreply.github.com> Co-authored-by: Kasia <24753130+ziomecka@users.noreply.github.com> Co-authored-by: Szymon Bieńkowski <szymon.bienkowski@fluxninja.com> Co-authored-by: Jakub Michalak <jakub.michalak@fluxninja.com> Co-authored-by: Harjot Gill <harjot.gill@fluxninja.com> Co-authored-by: Daria Bialobrzeska <88393714+DariaKunoichi@users.noreply.github.com> Co-authored-by: Gurinder Singh <gurnder.rawala@fluxninja.com> Co-authored-by: Jaseel <12792882+Spikatrix@users.noreply.github.com> Co-authored-by: Gurinder Singh <gurinder.rawala@fluxninja.com> Co-authored-by: dikshant-infracloud <160205839+dikshant-infracloud@users.noreply.github.com> Co-authored-by: dikshant <raidikshant2@gmail.com>
1 parent 4755eb5 commit 68b353a

File tree

472 files changed

+18067
-10757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+18067
-10757
lines changed

‎.betterer.results

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,11 +1296,7 @@ exports[`better eslint`] = {
12961296
],
12971297
"public/app/core/services/backend_srv.ts:5381": [
12981298
[0, 0, 0, "Do not use any type assertions.", "0"],
1299-
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
1300-
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
1301-
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
1302-
[0, 0, 0, "Unexpected any. Specify a different type.", "4"],
1303-
[0, 0, 0, "Unexpected any. Specify a different type.", "5"]
1299+
[0, 0, 0, "Do not use any type assertions.", "1"]
13041300
],
13051301
"public/app/core/services/context_srv.ts:5381": [
13061302
[0, 0, 0, "Do not use any type assertions.", "0"],
@@ -3103,9 +3099,6 @@ exports[`better eslint`] = {
31033099
[0, 0, 0, "Do not use any type assertions.", "7"],
31043100
[0, 0, 0, "Unexpected any. Specify a different type.", "8"]
31053101
],
3106-
"public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:5381": [
3107-
[0, 0, 0, "Unexpected any. Specify a different type.", "0"]
3108-
],
31093102
"public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx:5381": [
31103103
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
31113104
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "1"],

‎.circleci/config.yml

Lines changed: 276 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,276 @@
1+
version: 2.1
2+
3+
# this allows to use CircleCI's dynamic configuration feature
4+
setup: true
5+
6+
orbs:
7+
gcp-gcr: circleci/gcp-gcr@0.13.0
8+
9+
executors:
10+
base-cimg-executor:
11+
docker:
12+
- image: cimg/base:2022.07
13+
python-cimg-executor:
14+
docker:
15+
- image: cimg/python:3.10.4
16+
17+
commands:
18+
asdf_install:
19+
description: "Install tools using ASDF"
20+
parameters:
21+
tools:
22+
type: string
23+
description:
24+
"Newline separated list of tools to install. If empty, will install
25+
everything."
26+
default: ""
27+
cache_name:
28+
type: string
29+
description: "Name of asdf cache"
30+
default: "default"
31+
steps:
32+
- run:
33+
name: Install ASDF
34+
command: |
35+
git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.10.2
36+
printf '\nsource "${HOME}/.asdf/asdf.sh"\n' >> "${BASH_ENV}"
37+
date +%m > ~/month
38+
date +%d > ~/day
39+
# We need to restore ASDF cache after installing, otherwise we will try to clone it to non-empty dir
40+
- restore_cache:
41+
name: Restore ASDF cache
42+
keys:
43+
- grafana-asdf-cache-v7-{{ checksum "~/month" }}-<<
44+
parameters.cache_name >>-{{ checksum ".tool-versions" }}
45+
- grafana-asdf-cache-v7-{{ checksum "~/month" }}-<<
46+
parameters.cache_name >>-
47+
- run:
48+
name: Install ASDF tools
49+
environment:
50+
TOOLS: << parameters.tools >>
51+
command: .circleci/scripts/asdf_install.sh
52+
asdf_save_cache:
53+
parameters:
54+
cache_name:
55+
type: string
56+
description: "Name of asdf cache"
57+
default: "default"
58+
steps:
59+
- save_cache:
60+
name: Save ASDF cache
61+
key:
62+
grafana-asdf-cache-v7-{{ checksum "~/month" }}-<<
63+
parameters.cache_name >>-{{ checksum ".tool-versions" }}
64+
paths:
65+
- ~/.asdf
66+
opsninja_install:
67+
parameters:
68+
branch:
69+
type: string
70+
default: main
71+
description: opsninja branch to install from
72+
fingerprint:
73+
type: string
74+
default: 10:d1:92:4e:2a:55:81:c9:82:c2:74:ce:6d:0e:e8:a8 # fluxninja/cloud R/O
75+
description: What SSH identity to use for accessing opsninja repository
76+
steps:
77+
- add_ssh_keys:
78+
fingerprints:
79+
- << parameters.fingerprint >>
80+
- run:
81+
name: Install opsninja and its dependencies
82+
command: |
83+
# We need R/O access to cloud repository to be able to fetch opsninja library
84+
# FIXME: make "releases" of opsninja library somehow, even as a separate repository
85+
# to limit exposure.
86+
export CLOUD_RO_KEY_FINGERPRINT="<< parameters.fingerprint >>"
87+
export GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa_$(echo "${CLOUD_RO_KEY_FINGERPRINT}" | tr -d ':')"
88+
export SSH_AUTH_SOCK=""
89+
# Bust asdf cache as our opsninja version is always 0.0.0
90+
pip uninstall -y opsninja
91+
pip install 'git+ssh://git@github.com/fluxninja/cloud@<< parameters.branch >>#egg=opsninja&subdirectory=ops/apps/opsninja/'
92+
which asdf > /dev/null 2>&1 && asdf reshim
93+
94+
jobs:
95+
release-components:
96+
executor: base-cimg-executor
97+
steps:
98+
- checkout
99+
- asdf_install:
100+
cache_name: release
101+
tools: |-
102+
python
103+
gcloud
104+
- opsninja_install
105+
- run:
106+
name: Schedule release jobs
107+
working_directory: ops/apps/opsninja
108+
command: fn circleci trigger-release --tag << pipeline.git.tag >>
109+
- asdf_save_cache:
110+
cache_name: release
111+
build-push-add-tag:
112+
parameters:
113+
attach-workspace:
114+
type: boolean
115+
description: Boolean for whether or not to attach to an existing workspace
116+
default: false
117+
docker-context:
118+
type: string
119+
description: Path to the directory containing your build context, defaults to .
120+
default: .
121+
dockerfile:
122+
type: string
123+
description: Name of dockerfile to use, defaults to Dockerfile
124+
default: Dockerfile
125+
executor:
126+
type: executor
127+
description: executor to use for this job
128+
default: base-cimg-executor
129+
extra_build_args:
130+
type: string
131+
description: Extra flags to pass to docker build
132+
default: ""
133+
image:
134+
type: string
135+
description: A name for your Docker image
136+
path:
137+
type: string
138+
description: Path to the directory containing your Dockerfile, defaults to .
139+
default: .
140+
remote-docker-version:
141+
type: string
142+
description: Specify the remote docker version
143+
default: 20.10.14
144+
setup-remote-docker:
145+
type: boolean
146+
description: Setup and use CircleCI's remote Docker environment
147+
default: true
148+
tag:
149+
type: string
150+
description: A Docker image tag
151+
default: ${CIRCLE_SHA1:0:8}
152+
target-tag:
153+
type: string
154+
description: Additional image tag applied when job runs on fluxninja_micro_frontends branch
155+
default: latest
156+
use-docker-layer-caching:
157+
type: boolean
158+
description: Setup docker layer caching for optimized build
159+
default: false
160+
workspace-root:
161+
type: string
162+
description: >
163+
Workspace root path that is either an absolute path or a path relative
164+
to the working directory. Defaults to '.' (the working directory)
165+
default: .
166+
executor: <<parameters.executor>>
167+
environment:
168+
DOCKER_BUILDKIT: 1
169+
steps:
170+
- checkout
171+
- when:
172+
condition: <<parameters.setup-remote-docker>>
173+
steps:
174+
- setup_remote_docker:
175+
docker_layer_caching: <<parameters.use-docker-layer-caching>>
176+
version: <<parameters.remote-docker-version>>
177+
- gcp-gcr/gcr-auth
178+
- gcp-gcr/build-image:
179+
attach-workspace: <<parameters.attach-workspace>>
180+
docker-context: <<parameters.docker-context>>
181+
dockerfile: <<parameters.dockerfile>>
182+
extra_build_args: <<parameters.extra_build_args>>
183+
image: <<parameters.image>>
184+
path: <<parameters.path>>
185+
tag: <<parameters.tag>>
186+
workspace-root: <<parameters.workspace-root>>
187+
- gcp-gcr/push-image:
188+
image: <<parameters.image>>
189+
tag: <<parameters.tag>>
190+
- when:
191+
condition:
192+
equal: [coderabbit_micro_frontend, << pipeline.git.branch >>]
193+
steps:
194+
- gcp-gcr/tag-image:
195+
image: <<parameters.image>>
196+
source-tag: <<parameters.tag>>
197+
target-tag: <<parameters.target-tag>>
198+
update-environment:
199+
parameters:
200+
job-root:
201+
type: string
202+
default: "/home/circleci"
203+
description: The root folder of the job where all repositories will be cloned to
204+
manifests-repo:
205+
type: string
206+
default: git@github.com:fluxninja/argo-manifests.git
207+
description: ArgoCD manifests repository to update
208+
manifests-branch:
209+
type: string
210+
default: environments/latest
211+
description: Branch to use when pushing deployment changes
212+
environment-path:
213+
type: string
214+
description: Path to the environment to update
215+
component:
216+
type: string
217+
default: ""
218+
description: Application component to update image and deployment code for
219+
update:
220+
type: string
221+
default: everything
222+
description: Whether to update 'images', 'deployment-code' or 'everything'
223+
executor: python-cimg-executor
224+
steps:
225+
- add_ssh_keys:
226+
fingerprints:
227+
- "f9:49:04:10:b1:77:16:b0:0e:c0:ba:21:0e:9d:fd:40" # argo-manifests R/W
228+
- checkout
229+
- asdf_install:
230+
cache_name: release
231+
tools: |-
232+
python
233+
gcloud
234+
- gcp-gcr/gcr-auth
235+
- opsninja_install
236+
- run:
237+
name: Update application in the deployment
238+
environment:
239+
JOB_ROOT: << parameters.job-root >>
240+
UPDATE: << parameters.update >>
241+
MANIFESTS_BRANCH: << parameters.manifests-branch >>
242+
MANIFESTS_REPO: << parameters.manifests-repo >>
243+
COMPONENT: << parameters.component >>
244+
ENVIRONMENT_PATH: << parameters.environment-path >>
245+
command: .circleci/scripts/update_environment.sh
246+
247+
workflows:
248+
version: 2
249+
build-alpine:
250+
jobs:
251+
- build-push-add-tag:
252+
name: image-build-grafana-alpine
253+
image: cf-fn/grafana
254+
- update-environment:
255+
name: update-demo-environment
256+
filters:
257+
branches:
258+
only:
259+
- coderabbit_micro_frontend
260+
requires:
261+
- image-build-grafana-alpine
262+
environment-path: environments/latest/
263+
component: grafana
264+
update: images
265+
266+
release-components:
267+
when:
268+
matches: { value: << pipeline.git.tag >>, pattern: "^releases/.+$" }
269+
jobs:
270+
- release-components:
271+
# both this and workflow's when is needed
272+
filters:
273+
branches:
274+
ignore: /.+/
275+
tags:
276+
only: /releases\/.+/

‎.circleci/scripts/asdf_install.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
set -x
4+
5+
# shellcheck disable=SC2153
6+
readarray -t tools <<<"${TOOLS?}"
7+
if [ "${#tools[@]}" -eq 1 ] && [ -z "${tools[0]:-}" ]; then
8+
# Parameter was set to empty string
9+
tools=()
10+
fi
11+
12+
sudo apt-get update
13+
sudo apt-get install graphviz
14+
15+
# If we need to setup python
16+
if grep <<<"${TOOLS}" '^python$'; then
17+
# See https://github.com/pyenv/pyenv/wiki#suggested-build-environment
18+
sudo apt-get install make build-essential libssl-dev zlib1g-dev \
19+
libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
20+
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
21+
fi
22+
23+
(yes || true) | ./.circleci/scripts/manage_tools.sh setup "${tools[@]}"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /