send verbosity as Arg and analytics as Env

chart/stable/searchlight/README.md

@@ -55,6 +55,7 @@ The following tables lists the configurable parameters of the Searchlight chart
 | `rbac.create`             | If `true`, create and use RBAC resources                          | `true`                 |
 | `serviceAccount.create`   | If `true`, create a new service account                           | `true`                 |
 | `serviceAccount.name`     | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | `` |
+| `enableAnalytics`         | Send usage events to Google Analytics                             | `true`                 |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:

chart/stable/searchlight/templates/deployment.yaml

@@ -38,6 +38,7 @@ spec:
         - --audit-log-path=-
         - --tls-cert-file=/var/serving-cert/tls.crt
         - --tls-private-key-file=/var/serving-cert/tls.key
+        - --analytics={{ .Values.enableAnalytics }}
         ports:
         - containerPort: 8443
         - containerPort: 56790
@@ -61,6 +62,9 @@ spec:
         ports:
         - containerPort: 5665
         - containerPort: 60006
+        env:
+        - name: ENABLE_ANALYTICS
+          value: "{{ .Values.enableAnalytics }}"
         livenessProbe:
           httpGet:
             scheme: HTTPS

chart/stable/searchlight/values.yaml

@@ -81,3 +81,6 @@ serviceAccount:
   # The name of the ServiceAccount to use.
   # If not set and create is true, a name is generated using the fullname template
   name:
+
+# Send usage events to Google Analytics
+enableAnalytics: true

docs/reference/hyperalert/hyperalert.md

@@ -31,7 +31,6 @@ hyperalert [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
   -h, --help                             help for hyperalert
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
@@ -43,6 +42,7 @@ hyperalert [flags]
 
 ### SEE ALSO
 
+* [hyperalert analytics_id](/docs/reference/hyperalert/hyperalert_analytics_id.md)	 - 
 * [hyperalert check_ca_cert](/docs/reference/hyperalert/hyperalert_check_ca_cert.md)	 - Check Certificate expire date
 * [hyperalert check_cert](/docs/reference/hyperalert/hyperalert_check_cert.md)	 - Check Certificate expire date
 * [hyperalert check_component_status](/docs/reference/hyperalert/hyperalert_check_component_status.md)	 - Check Kubernetes Component Status

docs/reference/hyperalert/hyperalert_analytics_id.md

@@ -0,0 +1,46 @@
+---
+title: Analytics Id
+menu:
+  product_searchlight_6.0.0-alpha.0:
+    identifier: hyperalert-analytics-id
+    name: Analytics Id
+    parent: hyperalert-cli
+product_name: searchlight
+section_menu_id: reference
+menu_name: product_searchlight_6.0.0-alpha.0
+---
+## hyperalert analytics_id
+
+
+
+### Synopsis
+
+
+
+```
+hyperalert analytics_id [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for analytics_id
+```
+
+### Options inherited from parent commands
+
+```
+      --alsologtostderr                  log to standard error as well as files
+      --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
+      --log_dir string                   If non-empty, write log files in this directory
+      --logtostderr                      log to standard error instead of files
+      --stderrthreshold severity         logs at or above this threshold go to stderr
+  -v, --v Level                          log level for V logs
+      --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
+```
+
+### SEE ALSO
+
+* [hyperalert](/docs/reference/hyperalert/hyperalert.md)	 - AppsCode Icinga2 plugin
+
+

docs/reference/hyperalert/hyperalert_check_ca_cert.md

@@ -33,7 +33,6 @@ hyperalert check_ca_cert [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_cert.md

@@ -39,7 +39,6 @@ hyperalert check_cert [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_component_status.md

@@ -35,7 +35,6 @@ hyperalert check_component_status [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_env.md

@@ -31,7 +31,6 @@ hyperalert check_env [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_event.md

@@ -40,7 +40,6 @@ hyperalert check_event [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_influx_query.md

@@ -44,7 +44,6 @@ hyperalert check_influx_query [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_json_path.md

@@ -38,7 +38,6 @@ hyperalert check_json_path [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_node_exists.md

@@ -36,7 +36,6 @@ hyperalert check_node_exists [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_node_status.md

@@ -34,7 +34,6 @@ hyperalert check_node_status [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_pod_exec.md

@@ -37,7 +37,6 @@ hyperalert check_pod_exec [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_pod_exists.md

@@ -37,7 +37,6 @@ hyperalert check_pod_exists [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_pod_status.md

@@ -34,7 +34,6 @@ hyperalert check_pod_status [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_check_volume.md

@@ -39,7 +39,6 @@ hyperalert check_volume [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_notifier.md

@@ -41,7 +41,6 @@ hyperalert notifier [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/reference/hyperalert/hyperalert_version.md

@@ -32,7 +32,6 @@ hyperalert version [flags]
 
 ```
       --alsologtostderr                  log to standard error as well as files
-      --analytics                        Send analytical events to Google Analytics (default true)
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --logtostderr                      log to standard error instead of files

docs/setup/install.md

@@ -52,6 +52,7 @@ options:
     --image-pull-secret            name of secret used to pull searchlight operator images
     --run-on-master                run searchlight operator on master
     --enable-admission-webhook     configure admission webhook for searchlight CRDs
+    --analytics                    send usage events to Google Analytics (default: true)
     --uninstall                    uninstall searchlight
     --purge                        purges searchlight crd objects and crds
 ```

hack/deploy/operator.yaml

@@ -40,6 +40,7 @@ spec:
         - --audit-log-path=-
         - --tls-cert-file=/var/serving-cert/tls.crt
         - --tls-private-key-file=/var/serving-cert/tls.key
+        - --analytics="${SEARCHLIGHT_ENABLE_ANALYTICS}"
         ports:
         - containerPort: 8443
         - containerPort: 56790
@@ -59,6 +60,9 @@ spec:
         ports:
         - containerPort: 5665
         - containerPort: 60006
+        env:
+        - name: ENABLE_ANALYTICS
+          value: "${SEARCHLIGHT_ENABLE_ANALYTICS}"
         livenessProbe:
           httpGet:
             scheme: HTTPS

hack/deploy/searchlight.sh

@@ -56,6 +56,8 @@ export SEARCHLIGHT_DOCKER_REGISTRY=appscode
 export SEARCHLIGHT_IMAGE_PULL_SECRET=
 export SEARCHLIGHT_UNINSTALL=0
 export SEARCHLIGHT_PURGE=0
+export SEARCHLIGHT_ENABLE_ANALYTICS=true
+export SEARCHLIGH_ENABLE_ADMISSION_WEBHOOK=false
 
 KUBE_APISERVER_VERSION=$(kubectl version -o=json | $ONESSL jsonpath '{.serverVersion.gitVersion}')
 $ONESSL semver --check='>=1.9.0' $KUBE_APISERVER_VERSION
@@ -76,6 +78,7 @@ show_help() {
     echo "    --image-pull-secret            name of secret used to pull searchlight operator images"
     echo "    --run-on-master                run searchlight operator on master"
     echo "    --enable-admission-webhook     configure admission webhook for searchlight CRDs"
+    echo "    --analytics                    send usage events to Google Analytics (default: true)"
     echo "    --uninstall                    uninstall searchlight"
     echo "    --purge                        purges searchlight crd objects and crds"
 }
@@ -113,8 +116,13 @@ while test $# -gt 0; do
             val=`echo $1 | sed -e 's/^[^=]*=//g'`
             if [ "$val" = "false" ]; then
                 export SEARCHLIGHT_ENABLE_ADMISSION_WEBHOOK=false
-            else
-                export SEARCHLIGHT_ENABLE_ADMISSION_WEBHOOK=true
+            fi
+            shift
+            ;;
+        --analytics*)
+            val=`echo $1 | sed -e 's/^[^=]*=//g'`
+            if [ "$val" = "false" ]; then
+                export SEARCHLIGHT_ENABLE_ANALYTICS=false
             fi
             shift
             ;;

hack/dev/README.md

@@ -57,7 +57,7 @@ curl -k -vv https://192.168.99.100:8443/apis --cert $HOME/.minikube/client.crt -
 curl -k -vv https://10.0.2.2:8443/apis/incidents.monitoring.appscode.com/v1alpha1
 
 ```
-$ kubectl create -f ./hack/dev/run-operator.yaml
+$ ./hack/dev/run-operator.sh
 
 $ kubectl create -f ./hack/dev/apiregistration.yaml
 $ kubectl get apiservice v1alpha1.incidents.monitoring.appscode.com -o yaml