Merge remote-tracking branch 'couchbase/neo' into master

| * afaf0d7 MB-51770: return warning about self-signed certs
| * 6349068 MB-52275: upgrade ramda to 0.28
| * a5ff204 MB-51364: Phonehome: capture bucket storage backend type
| * 4efb069 MB-47422: Phonehome: capture stat for SyncWrites
| * 26d2f30 MB-52278: update js-beautify to 1.14.3

Change-Id: Id0c7ef926eec596f6ca85e298d513b914afbc09e

Author: pavel-blagodov

priv/public/ui/app/mn.security.audit.item.component.js

@@ -12,7 +12,7 @@ import {Component, ChangeDetectionStrategy} from '@angular/core';
 import {pluck, scan, distinctUntilChanged, shareReplay,
         takeUntil, startWith, map} from 'rxjs/operators';
 import {Subject, combineLatest} from 'rxjs';
-import {not, pipe, contains, all, equals} from 'ramda';
+import {not, pipe, includes, all, equals} from 'ramda';
 import {FormControl, FormGroup} from '@angular/forms';
 
 import {MnLifeCycleHooksToStream} from './mn.core.js';
@@ -77,7 +77,7 @@ class MnSecurityAuditItemComponent extends MnLifeCycleHooksToStream {
       .subscribe(this.maybeDisableFields.bind(this));
 
     this.isThereEnabledField =
-      this.thisModuleChanges.pipe(map(pipe(Object.values, contains(true))),
+      this.thisModuleChanges.pipe(map(pipe(Object.values, includes(true))),
                                   shareReplay({refCount: true, bufferSize: 1}));
 
     this.thisModuleChanges

priv/public/ui/app/mn_admin/mn_servers_add_dialog.html

@@ -22,10 +22,10 @@ <h2>Add Server Node</h2>
       <div class="error error-form">
         Warning: Adding a server to this cluster means any previous Couchbase Server data on that server will be removed.
       </div>
-      <!-- <div class="error error-form"
-           ng-show="serversAddDialogCtl.certificate.cert.type == 'generated'">
-           This cluster is using self-signed certificates. No peer verification between nodes will be done.
-           </div> -->
+      <div class="error error-form"
+         ng-show="serversAddDialogCtl.certificatesByNode[serversAddDialogCtl.selfConfig.selfConfig.configuredHostname].type === 'generated'">
+        This cluster is using self-signed certificates. No peer verification between nodes will be done.
+      </div>
       <div class="error error-form" ng-if="('isString' | lodash:serversAddDialogCtl.errors)">
         Attention: {{serversAddDialogCtl.errors}}</div>
       <div class="error error-form" ng-if="('isArray' | lodash:serversAddDialogCtl.errors)">

priv/public/ui/app/mn_admin/mn_servers_add_dialog_controller.js

@@ -51,9 +51,9 @@ function mnServersAddDialogController($scope, $rootScope, $q, $uibModal, mnServe
 
   function activate() {
     reset();
-    if ($scope.poolDefault.isEnterprise) {
-      mnPromiseHelper(vm, mnCertificatesService.getPoolsDefaultTrustedCAs())
-        .applyToScope("certificate");
+    if ($scope.rbac.cluster.admin.security.read) {
+      mnPromiseHelper(vm, mnCertificatesService.getNodeCertificateSettingsByNode())
+        .applyToScope("certificatesByNode");
     }
     mnClusterConfigurationService.getSelfConfig().then(function (selfConfig) {
       var rv = {};

priv/public/ui/app/mn_admin/mn_settings_notifications_service.js

@@ -155,6 +155,10 @@ angular.module('mnSettingsNotificationsService', [
       },
       buckets: { //Number of buckets
         total: bucketsList.length,
+        magma: bucketsList.byType.membase
+          .filter((bucket) => bucket.storageBackend === "magma").length,
+        couchstore: bucketsList.byType.membase
+          .filter((bucket) => bucket.storageBackend === "couchstore").length,
         membase: bucketsList.byType.membase.length,
         memcached: bucketsList.byType.memcached.length,
         ephemeral: bucketsList.byType.ephemeral.length
@@ -234,7 +238,8 @@ angular.module('mnSettingsNotificationsService', [
         "total_avg_view_accesses",
         "total_avg_index_num_rows_returned",
         "vb_active_sync_write_committed_count",
-        "total_curr_items_tot"
+        "total_curr_items_tot",
+        "kv_vb_sync_write_accepted_count"
       ]).map(function (stat, index) {
         let day = dayStats[index].data[0];
         let hour = hourStats[index].data[0];
@@ -393,6 +398,10 @@ angular.module('mnSettingsNotificationsService', [
         }, {
           applyFunctions: ["sum"],
           metric: [{label: "name", value: "kv_curr_items_tot"}]//kv_curr_items_tot
+        }, {
+          applyFunctions: ["sum"],
+          metric: [{label: "name", value: "kv_vb_sync_write_accepted_count"},
+                   {label: "state", value: "active"}]//kv_vb_sync_write_accepted_count
         }];
         let dayStatsConfigs = interestingStats.map(metric => {
           return Object.assign({}, avgCommonSettingsDay, metric);

priv/public/ui/package-lock.json

@@ -48,11 +48,11 @@
     "d3-zoom": "1.8.3",
     "file-saver": "2.0.2",
     "ipaddr.js": "2.0.1",
-    "js-beautify": "1.10.3",
+    "js-beautify": "1.14.3",
     "lodash": "3.3.0",
     "ngx-clipboard": "12.3.1",
     "oclazyload": "1.1.0",
-    "ramda": "0.26.1",
+    "ramda": "0.28.0",
     "rxjs": "6.5.3",
     "sortablejs": "1.10.2",
     "zone.js": "^0.9.1"