Add default flag for dataviews

README.md

@@ -41,6 +41,12 @@ Configuration options are documented in [chart README file](charts/eck-custom-re
 
 ## Upgrade guide
 
+### From 0.7.0 to 0.8.0
+The CRD for Kibana DataView was changed - the `defaultView` field was added, to flag if the Data View should be configured as default in target instance Kibana. To update the CRD manually, run:
+```
+kubectl apply --server-side -f https://raw.githubusercontent.com/xco-sk/eck-custom-resources/v0.8.0/config/crd/bases/kibana.eck.github.com_dataviews.yaml
+```
+
 ### From 0.6.0 to 0.7.0
 There is a new `ComponentTemplate` CRD present. To apply the CRD, run:
 ```

apis/kibana.eck/v1alpha1/dataview_types.go

@@ -24,7 +24,8 @@ import (
 type DataViewSpec struct {
 	// +optional
 	TargetConfig CommonKibanaConfig `json:"targetInstance,omitempty"`
-
+	// DefaultView defines if this DataView is configured as default in Kibana
+	DefaultView *bool `json:"defaultView,omitempty"`
 	SavedObject `json:",inline"`
 }
 

charts/eck-custom-resources-operator/Chart.yaml

@@ -9,5 +9,5 @@ maintainers:
     email: [email protected]
     url: https://github.com/xco-sk
 type: application
-version: 0.7.0
-appVersion: 0.7.0
+version: 0.8.0
+appVersion: 0.8.0

config/crd/bases/kibana.eck.github.com_dataviews.yaml

@@ -41,6 +41,10 @@ spec:
             properties:
               body:
                 type: string
+              defaultView:
+                description: DefaultView defines if this DataView is configured as
+                  default in Kibana
+                type: boolean
               dependencies:
                 items:
                   properties:

config/samples/kibana.eck_v1alpha1_dataview.yaml

@@ -9,6 +9,7 @@ spec:
   dependencies:
     - type: lens
       name: lens-sample
+  defaultView: false
   body: |
     {
       "title": "sample-index-*",

docs/cr_data_view.md

@@ -15,12 +15,13 @@ See [Data Views APIs](https://www.elastic.co/guide/en/kibana/current/data-views-
 ## Fields
 
 | Key                         | Type            | Description                                                                                                                                     | Default                                              |
-|-----------------------------|-----------------|-------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------|
-| `metadata.name`             | string          | Name of the Data View visualization, used also as its ID in Kibana                                                                                   | No default                                           |
-| `spec.space`                | string          | Name of the Kibana namespace to which the Data View is deployed to                                                                                   | No default (will be deployed to "default" namespace) |
-| `spec.targetInstance.name`  | string         | Name of the [Kibana Instance](cr_kibana_instance.md) to which this DataView will be deployed to | The operator configuration |
-| `spec.body`                 | string          | Data View definition (the inner part of the requests) json                                                                                                                            | No default                                           |
-| `spec.dependencies`         | List of objects | List of dependencies - the reconciler will wait for all resources from the list to be present in Kibana before deploying/updating this resource | -                                                    |                                                 |
+| --------------------------- | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| `metadata.name`             | string          | Name of the Data View visualization, used also as its ID in Kibana                                                                              | No default                                           |
+| `spec.space`                | string          | Name of the Kibana namespace to which the Data View is deployed to                                                                              | No default (will be deployed to "default" namespace) |
+| `spec.targetInstance.name`  | string          | Name of the [Kibana Instance](cr_kibana_instance.md) to which this DataView will be deployed to                                                 | The operator configuration                           |
+| `spec.body`                 | string          | Data View definition (the inner part of the requests) json                                                                                      | No default                                           |
+| `spec.defaultView`          | boolean         | Flag if the Data View should be configured as default in target instance Kibana                                                                 | false                                                |
+| `spec.dependencies`         | List of objects | List of dependencies - the reconciler will wait for all resources from the list to be present in Kibana before deploying/updating this resource | -                                                    |  |
 | `spec.dependencies[].space` | string          | Kibana Space where to look for given resource                                                                                                   | -                                                    |
 | `spec.dependencies[].type`  | string          | Type of resource - one of `visualization, dashboard, search, index-pattern, lens`                                                               | -                                                    |
 | `spec.dependencies[].name`  | string          | Name of resource                                                                                                                                | -                                                    |
@@ -39,6 +40,7 @@ spec:
   dependencies:
     - type: lens
       name: lens-sample
+  defaultView: true
   body: |
     {
       "title": "sample-index-*",

utils/kibana/dataview_utils.go

@@ -39,7 +39,6 @@ func UpsertDataView(kClient Client, dataView kibanaeckv1alpha1.DataView) (ctrl.R
 	} else {
 		res, err = kClient.DoPost(formatDataViewUrl(dataView.Spec.Space), *modifiedBody)
 	}
-
 	if err != nil {
 		return utils.GetRequeueResult(), err
 	}
@@ -51,6 +50,11 @@ func UpsertDataView(kClient Client, dataView kibanaeckv1alpha1.DataView) (ctrl.R
 		return utils.GetRequeueResult(), fmt.Errorf("Non-success (%d) response: %s, ", res.StatusCode, string(resBody))
 	}
 
+	err = handleDefaultFlagOnUpsert(dataView, kClient)
+	if err != nil {
+		return utils.GetRequeueResult(), err
+	}
+
 	return ctrl.Result{}, nil
 }
 
@@ -130,3 +134,35 @@ func removeName(objectJson string, id string) (*string, error) {
 	sBody := string(marshalledBody)
 	return &sBody, nil
 }
+
+func handleDefaultFlagOnUpsert(dataview kibanaeckv1alpha1.DataView, kClient Client) error {
+	if dataview.Spec.DefaultView != nil && *dataview.Spec.DefaultView {
+		saveDefaultView(&dataview.Name, dataview.Spec.Space, kClient)
+	}
+	return nil
+}
+
+func saveDefaultView(dataViewName *string, space *string, kClient Client) error {
+	body := make(map[string]interface{})
+	body["data_view_id"] = dataViewName
+	body["force"] = true
+
+	marshalledBody, err := json.Marshal(body)
+	if err != nil {
+		return err
+	}
+	_, err = kClient.DoPost(formatDefaultDataViewUrl(space), string(marshalledBody))
+	return err
+}
+
+func getDefaultDataView(space *string, kClient Client) (*string, error) {
+	_, err = kClient.DoGet(formatDefaultDataViewUrl(space), string(marshalledBody))
+
+}
+
+func formatDefaultDataViewUrl(space *string) string {
+	if space == nil {
+		return "/api/data_views/default"
+	}
+	return fmt.Sprintf("/s/%s/api/data_views/default", *space)
+}