diff --git a/cmd/provisioner-localpv/app/provisioner.go b/cmd/provisioner-localpv/app/provisioner.go index de955f08..4295acd0 100644 --- a/cmd/provisioner-localpv/app/provisioner.go +++ b/cmd/provisioner-localpv/app/provisioner.go @@ -1,19 +1,3 @@ -/* -Copyright 2019 The OpenEBS Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - /* This file contains the volume creation and deletion handlers invoked by the github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller. @@ -50,10 +34,12 @@ import ( const ( // Ping message Ping string = "ping" + // Heartbeat message. + Heartbeat string = "heartbeat" // DefaultCASType Event application name constant for volume event - DefaultCASType string = "localpv" + DefaultCASType string = "hostpath-localpv" // DefaultUnknownReplicaCount is the default replica count - DefaultUnknownReplicaCount string = "replica:1" + DefaultUnknownReplicaCount string = "1" ) // NewProvisioner will create a new Provisioner object and initialize @@ -211,10 +197,10 @@ func sendEventOrIgnore(pvcName, pvName, capacity, stgType, method string) { analytics.New().CommonBuild(stgType).ApplicationBuilder(). SetVolumeName(pvName). SetVolumeClaimName(pvcName). - SetLabel(analytics.EventLabelCapacity). - SetAction(DefaultUnknownReplicaCount). + SetReplicaCount(DefaultUnknownReplicaCount). SetCategory(method). - SetVolumeCapacity(capacity).Send() + SetVolumeCapacity(capacity). + Send() } // validateVolumeSource validates datasource field of the pvc. diff --git a/cmd/provisioner-localpv/app/start.go b/cmd/provisioner-localpv/app/start.go index 2359435c..04a0427b 100644 --- a/cmd/provisioner-localpv/app/start.go +++ b/cmd/provisioner-localpv/app/start.go @@ -1,19 +1,3 @@ -/* -Copyright 2019 The OpenEBS Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - package app import ( @@ -102,7 +86,8 @@ func Start(cmd *cobra.Command) error { if menv.Truthy(menv.OpenEBSEnableAnalytics) { analytics.RegisterVersionGetter(version.GetVersionDetails) analytics.New().CommonBuild(DefaultCASType).InstallBuilder(true).Send() - go analytics.PingCheck(DefaultCASType, Ping) + go analytics.PingCheck(DefaultCASType, Ping, false) + go analytics.PingCheck(DefaultCASType, Heartbeat, true) } klog.V(4).Info("Provisioner started") diff --git a/go.mod b/go.mod index f8a9ad04..d848cdab 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/onsi/ginkgo v1.16.4 github.com/onsi/gomega v1.27.4 - github.com/openebs/google-analytics-4 v0.1.0 + github.com/openebs/google-analytics-4 v0.2.1 github.com/openebs/maya v1.12.1-0.20211022052259-bd98908028af github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.1.3 @@ -25,7 +25,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/go-units v0.5.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/emicklei/go-restful/v3 v3.10.2 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/ghodss/yaml v1.0.0 // indirect diff --git a/go.sum b/go.sum index 94531707..95992a9f 100644 --- a/go.sum +++ b/go.sum @@ -108,9 +108,9 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -391,8 +391,8 @@ github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9 github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= -github.com/openebs/google-analytics-4 v0.1.0 h1:6aUDbQoh1ezb+NU/MkapFKffogW4QK3WYt8g2UmENe8= -github.com/openebs/google-analytics-4 v0.1.0/go.mod h1:3DkQfGCo79pZhL76Xtg0/R7LNLMttW6Bm/uP0yiZQHU= +github.com/openebs/google-analytics-4 v0.2.1 h1:+DgJjcPM3uVyWp9VxvNQgNXCWWv0OFhopijFdPVVX9Q= +github.com/openebs/google-analytics-4 v0.2.1/go.mod h1:lKjvRs6HAYOlOTYjtOUp35iTutoXzRL0hOeVAvLAfZI= github.com/openebs/lib-csi v0.8.2 h1:HmoiZX3VXFPglwqnRPnRus7K58ixDWBa19OpPZGk2Ws= github.com/openebs/lib-csi v0.8.2/go.mod h1:4yc0Q1thH+oU80z73zGELfrOw2yeLdLNIRmcrxBxsBc= github.com/openebs/maya v1.12.1-0.20211022052259-bd98908028af h1:ybONzwC+k/zvgDcsCAatvT6u2j75tIVNYu5jX1pTmJE=