openebs · kmova · Jun 8, 2020 · Jun 7, 2020
diff --git a/changelogs/unreleased/150-pawanpraka1 b/changelogs/unreleased/150-pawanpraka1
@@ -0,0 +1 @@
+include pvc name in volume events
diff --git a/deploy/operators/centos7/zfs-operator.yaml b/deploy/operators/centos7/zfs-operator.yaml
@@ -1038,6 +1038,7 @@ spec:
             - "--strict-topology"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/operators/centos8/zfs-operator.yaml b/deploy/operators/centos8/zfs-operator.yaml
@@ -1038,6 +1038,7 @@ spec:
             - "--strict-topology"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/yamls/centos7/zfs-driver.yaml b/deploy/yamls/centos7/zfs-driver.yaml
@@ -570,6 +570,7 @@ spec:
             - "--strict-topology"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/yamls/centos8/zfs-driver.yaml b/deploy/yamls/centos8/zfs-driver.yaml
@@ -570,6 +570,7 @@ spec:
             - "--strict-topology"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/yamls/ubuntu/zfs-driver.yaml b/deploy/yamls/ubuntu/zfs-driver.yaml
@@ -570,6 +570,7 @@ spec:
             - "--strict-topology"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/zfs-operator.yaml b/deploy/zfs-operator.yaml
@@ -1038,6 +1038,7 @@ spec:
             - "--strict-topology"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -61,11 +61,12 @@ var SupportedVolumeCapabilityAccessModes = []*csi.VolumeCapability_AccessMode{
 }
 
 // sendEventOrIgnore sends anonymous local-pv provision/delete events
-func sendEventOrIgnore(pvName, capacity, stgType, method string) {
+func sendEventOrIgnore(pvcName, pvName, capacity, stgType, method string) {
 	if zfs.GoogleAnalyticsEnabled == "true" {
 		analytics.New().Build().ApplicationBuilder().
 			SetVolumeType(stgType, method).
 			SetDocumentTitle(pvName).
+			SetCampaignName(pvcName).
 			SetLabel(analytics.EventLabelCapacity).
 			SetReplicaCount(analytics.LocalPVReplicaCount, method).
 			SetCategory(method).
@@ -204,6 +205,7 @@ func (cs *controller) CreateVolume(
 	pool := helpers.GetInsensitiveParameter(&parameters, "poolname")
 	size := req.GetCapacityRange().RequiredBytes
 	contentSource := req.GetVolumeContentSource()
+	pvcName := helpers.GetInsensitiveParameter(&parameters, "csi.storage.k8s.io/pvc/name")
 
 	if err = cs.validateVolumeCreateReq(req); err != nil {
 		return nil, err
@@ -221,7 +223,7 @@ func (cs *controller) CreateVolume(
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	sendEventOrIgnore(volName, strconv.FormatInt(int64(size), 10), "zfs-localpv", analytics.VolumeProvision)
+	sendEventOrIgnore(pvcName, volName, strconv.FormatInt(int64(size), 10), "zfs-localpv", analytics.VolumeProvision)
 
 	topology := map[string]string{zfs.ZFSTopologyKey: selected}
 	cntx := map[string]string{zfs.PoolNameKey: pool}
@@ -268,7 +270,7 @@ func (cs *controller) DeleteVolume(
 		)
 	}
 
-	sendEventOrIgnore(volumeID, vol.Spec.Capacity, "zfs-localpv", analytics.VolumeDeprovision)
+	sendEventOrIgnore("", volumeID, vol.Spec.Capacity, "zfs-localpv", analytics.VolumeDeprovision)
 
 deleteResponse:
 	return csipayload.NewDeleteVolumeResponseBuilder().Build(), nil

diff --git a/pkg/usage/googleanalytics.go b/pkg/usage/googleanalytics.go
@@ -34,6 +34,7 @@ func (u *Usage) Send() {
 		gaClient.ClientID(u.clientID).
 			CampaignSource(u.campaignSource).
 			CampaignContent(u.clientID).
+			CampaignName(u.campaignName).
 			ApplicationID(u.appID).
 			ApplicationVersion(u.appVersion).
 			DataSource(u.dataSource).

diff --git a/pkg/usage/usage.go b/pkg/usage/usage.go
@@ -86,6 +86,9 @@ type Gclient struct {
 	// anonymous campaign source
 	campaignSource string
 
+	// anonymous campaign name
+	campaignName string
+
 	// https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#ds
 	// (usecase) node-detail
 	dataSource string
@@ -133,6 +136,12 @@ func (u *Usage) SetApplicationName(appName string) *Usage {
 	return u
 }
 
+// SetCampaignName : set the name of the PVC or will be empty.
+func (u *Usage) SetCampaignName(campaignName string) *Usage {
+	u.campaignName = campaignName
+	return u
+}
+
 // SetApplicationID : usecase(OpenEBS/NDM)
 func (u *Usage) SetApplicationID(appID string) *Usage {
 	u.appID = appID