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.

Sign up for GitHub

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

Jump to bottom

Remove unusued spec.name #344

Merged
merged 1 commit into from
Feb 5, 2021
Merged

Remove unusued spec.name #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion deploy/examples/dashboards/DashboardFromConfigMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
labels:
app: grafana
spec:
name: grafana-dashboard-from-config-map.json
configMapRef:
name: simple-dashboard-from-cm
key: foo
Expand Down
1 change: 0 additions & 1 deletion deploy/examples/dashboards/DashboardFromURL.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ metadata:
labels:
app: grafana
spec:
name: grafana-dashboard-from-url.json
url: https://raw.githubusercontent.com/integr8ly/grafana-operator/master/deploy/examples/remote/grafana-dashboard.json
json:
1 change: 0 additions & 1 deletion deploy/examples/dashboards/DashboardWithCustomFolder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
labels:
app: grafana
spec:
name: dashboard-with-custom-folder.json
customFolderName: "newCustomFolder"
json: >
{
Expand Down
1 change: 0 additions & 1 deletion deploy/examples/dashboards/DashboardWithPlugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
labels:
app: grafana
spec:
name: dashboard-with-plugins.json
json: >
{
"id": null,
Expand Down
1 change: 0 additions & 1 deletion deploy/examples/dashboards/KeycloakDashboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
labels:
app: grafana
spec:
name: keycloak-dashboard.json
plugins:
- name: grafana-piechart-panel
version: 1.3.9
Expand Down
1 change: 0 additions & 1 deletion deploy/examples/dashboards/SimpleDashboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
labels:
app: grafana
spec:
name: simple-dashboard.json
json: >
{
"id": null,
Expand Down
1 change: 0 additions & 1 deletion documentation/dashboards.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Dashboards are represented by the `GrafanaDashboard` custom resource. Examples c

The following properties are accepted in the `spec`:

* *name*: The filename of the dashboard that gets mounted into a volume in the grafana instance. Not to be confused with `metadata.name`.
* *json*: Raw json string with the dashboard contents. Check the [official documentation](https://grafana.com/docs/reference/dashboard/#dashboard-json).
* *jsonnet*: Jsonnet source. The [Grafonnet](https://grafana.github.io/grafonnet-lib/) library is made available automatically and can be imported.
* *url*: Url address to download a json or jsonnet string with the dashboard contents.
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/integreatly/v1alpha1/grafanadashboard_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ type GrafanaDashboardSpec struct {
// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
Json string `json:"json"`
Jsonnet string `json:"jsonnet"`
Name string `json:"name"`
Plugins PluginList `json:"plugins,omitempty"`
Url string `json:"url,omitempty"`
ConfigMapRef *corev1.ConfigMapKeySelector `json:"configMapRef,omitempty"`
Expand Down