Skip to content

Commit 2e6040e

Browse files
gurinder39gurinder39
committed
mod, cue and gihub flow fix
1 parent e344d44 commit 2e6040e

File tree

12 files changed

+3
-343
lines changed

12 files changed

+3
-343
lines changed

Diff for: ‎.github/workflows/issue-opened.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,5 @@ jobs:
2424
uses: ./actions/commands
2525
with:
2626
metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
27-
<<<<<<<< HEAD:.github/workflows/issue-opened.yml
2827
token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
29-
configPath: "issue-opened"
30-
|||||||| 78f0340031:.github/workflows/commands.yml
31-
token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
32-
configPath: commands
33-
========
34-
token: ${{secrets.ISSUE_COMMANDS_TOKEN}}
35-
configPath: commands
36-
>>>>>>>> v10.1.1:.github/workflows/commands.yml
28+
configPath: "issue-opened"

Diff for: ‎docs/sources/developers/kinds/composable/bargaugepanelcfg/schema-reference.md

-12
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ title: BarGaugePanelCfg kind
2121

2222
It extends [SingleStatBaseOptions](#singlestatbaseoptions).
2323

24-
<<<<<<< HEAD
25-
| Property | Type | Required | Default | Description |
26-
|-----------------|-------------------------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------|
27-
| `displayMode` | string | **Yes** | | Enum expressing the possible display modes<br/>for the bar gauge component of Grafana UI<br/>Possible values are: `basic`, `lcd`, `gradient`. |
28-
| `minVizHeight` | uint32 | **Yes** | `10` | |
29-
| `minVizWidth` | uint32 | **Yes** | `0` | |
30-
| `showUnfilled` | boolean | **Yes** | `true` | |
31-
| `orientation` | string | No | | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`. |
32-
| `reduceOptions` | [ReduceDataOptions](#reducedataoptions) | No | | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs |
33-
| `text` | [VizTextDisplayOptions](#viztextdisplayoptions) | No | | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs |
34-
=======
3524
| Property | Type | Required | Description |
3625
|-----------------|-------------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------|
3726
| `displayMode` | string | **Yes** | Enum expressing the possible display modes<br/>for the bar gauge component of Grafana UI<br/>Possible values are: `basic`, `lcd`, `gradient`. |
@@ -42,7 +31,6 @@ It extends [SingleStatBaseOptions](#singlestatbaseoptions).
4231
| `orientation` | string | No | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs<br/>Possible values are: `auto`, `vertical`, `horizontal`. |
4332
| `reduceOptions` | [ReduceDataOptions](#reducedataoptions) | No | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs |
4433
| `text` | [VizTextDisplayOptions](#viztextdisplayoptions) | No | *(Inherited from [SingleStatBaseOptions](#singlestatbaseoptions))*<br/>TODO docs |
45-
>>>>>>> main
4634

4735
### ReduceDataOptions
4836

Diff for: ‎docs/sources/developers/kinds/composable/tablepanelcfg/schema-reference.md

-11
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ title: TablePanelCfg kind
1919

2020
### PanelOptions
2121

22-
<<<<<<< HEAD
23-
| Property | Type | Required | Default | Description |
24-
|-----------------|---------------------------------------------------|----------|----------------------------------------------|--------------------------------------------------------------------|
25-
| `frameIndex` | number | **Yes** | `0` | Represents the index of the selected frame |
26-
| `showHeader` | boolean | **Yes** | `true` | Controls whether the panel should show the header |
27-
| `footer` | [object](#footer) | No | `map[countRows:false reducer:[] show:false]` | Controls footer options |
28-
| `showRowNums` | boolean | No | `false` | Controls whether the columns should be numbered |
29-
| `showTypeIcons` | boolean | No | `false` | Controls whether the header should show icons for the column types |
30-
| `sortBy` | [TableSortByFieldState](#tablesortbyfieldstate)[] | No | | Used to control row sorting |
31-
=======
3222
| Property | Type | Required | Description |
3323
|-----------------|---------------------------------------------------|----------|--------------------------------------------------------------------------------------|
3424
| `frameIndex` | number | **Yes** | Represents the index of the selected frame Default: `0`. |
@@ -38,7 +28,6 @@ title: TablePanelCfg kind
3828
| `showRowNums` | boolean | No | Controls whether the columns should be numbered Default: `false`. |
3929
| `showTypeIcons` | boolean | No | Controls whether the header should show icons for the column types Default: `false`. |
4030
| `sortBy` | [TableSortByFieldState](#tablesortbyfieldstate)[] | No | Used to control row sorting |
41-
>>>>>>> main
4231

4332
### TableSortByFieldState
4433

Diff for: ‎go.mod

-3
Original file line numberDiff line numberDiff line change
@@ -417,14 +417,12 @@ require (
417417
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 // indirect
418418
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect
419419
github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0 // indirect
420-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
421420
github.com/Masterminds/sprig/v3 v3.2.2 // @grafana/backend-platform
422421
github.com/Microsoft/go-winio v0.6.0 // indirect
423422
github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756 // @grafana/plugins-platform-backend
424423
github.com/RoaringBitmap/roaring v0.9.4 // indirect
425424
github.com/acomagu/bufpipe v1.0.3 // indirect
426425
github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
427-
github.com/bitly/go-simplejson v0.5.1
428426
github.com/bits-and-blooms/bitset v1.2.0 // indirect
429427
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
430428
github.com/blevesearch/mmap-go v1.0.4 // indirect
@@ -445,7 +443,6 @@ require (
445443
github.com/go-logr/logr v1.2.4 // @grafana/grafana-app-platform-squad
446444
github.com/go-logr/stdr v1.2.2 // indirect
447445
github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-app-platform-squad
448-
github.com/grafadruid/go-druid v0.0.6
449446
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
450447
github.com/hmarr/codeowners v1.1.2 // @grafana/grafana-as-code
451448
github.com/imdario/mergo v0.3.13 // indirect

0 commit comments

Comments
 (0)