Revert "AMBARI-15666. Add visibility attribute into SCRIPT params (dlysnichenko)"

This reverts commit df665c529d97a240557849e21c16c1796397f643.

Conflicts:
	ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java

ambari-server/src/main/java/org/apache/ambari/server/state/alert/ScriptSource.java

@@ -112,10 +112,6 @@ public class ScriptSource extends Source {
     @SerializedName("type")
     private ScriptParameterType m_type;
 
-
-    @SerializedName("visibility")
-    private ScriptParameterVisibility m_visibility;
-
     /**
      * If this script parameter controls a threshold, then its specified here,
      * otherwise it's {@code null}.
@@ -168,14 +164,6 @@ public class ScriptSource extends Source {
       return m_description;
     }
 
-    /**
-     * Gets the visibility of the parameter.
-     * @return the visibility
-     */
-    public ScriptParameterVisibility getVisibility() {
-      return m_visibility;
-    }
-
     /**
      * Gets the threshold that this parameter directly controls, or {@code null}
      * for none.
@@ -200,7 +188,6 @@ public class ScriptSource extends Source {
       result = prime * result + ((m_type == null) ? 0 : m_type.hashCode());
       result = prime * result + ((m_units == null) ? 0 : m_units.hashCode());
       result = prime * result + ((m_value == null) ? 0 : m_value.hashCode());
-      result = prime * result + ((m_visibility == null) ? 0 : m_visibility.hashCode());
       return result;
     }
 
@@ -260,13 +247,6 @@ public class ScriptSource extends Source {
       } else if (!m_value.equals(other.m_value)) {
         return false;
       }
-      if (m_visibility == null) {
-        if (other.m_visibility != null) {
-          return false;
-        }
-      } else if (!m_visibility.equals(other.m_visibility)) {
-        return false;
-      }
       return true;
     }
 
@@ -290,14 +270,5 @@ public class ScriptSource extends Source {
        */
       PERCENT
     }
-
-    /**
-     * The {@link ScriptParameterVisibility} enum represents the visibility of script parameter.
-     */
-    public enum ScriptParameterVisibility {
-      VISIBLE,
-      HIDDEN,
-      READ_ONLY
-    }
   }
 }

ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java

@@ -159,18 +159,6 @@ public class SchemaUpgradeHelper {
    * Extension of main controller module
    */
   public static class UpgradeHelperModule extends ControllerModule {
-    public static class AuditLoggerMock implements AuditLogger {
-
-      @Override
-      public void log(AuditEvent event) {
-
-      }
-
-      @Override
-      public boolean isEnabled() {
-        return false;
-      }
-    }
 
     public UpgradeHelperModule() throws Exception {
     }
@@ -183,7 +171,6 @@ public class SchemaUpgradeHelper {
     protected void configure() {
       super.configure();
       // Add binding to each newly created catalog
-      bind(AuditLogger.class).to(AuditLoggerMock.class);
       Multibinder<UpgradeCatalog> catalogBinder =
         Multibinder.newSetBinder(binder(), UpgradeCatalog.class);
       catalogBinder.addBinding().to(UpgradeCatalog150.class);

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java

@@ -46,9 +46,6 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.RepositoryType;
 import org.apache.ambari.server.state.State;
-import org.apache.ambari.server.state.alert.AlertDefinition;
-import org.apache.ambari.server.state.alert.ScriptSource;
-import org.apache.ambari.server.state.alert.Source;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.support.JdbcUtils;
@@ -264,52 +261,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
   }
 
   protected void updateAlerts() {
-    // map of alert_name -> property_name -> visibility_value
-    final Map<String, String> hdfsVisibilityMap = new HashMap<String, String>(){{
-      put("mergeHaMetrics", "HIDDEN");
-      put("appId", "HIDDEN");
-      put("metricName", "HIDDEN");
-    }};
-    final Map<String, String> defaultKeytabVisibilityMap = new HashMap<String, String>(){{
-      put("default.smoke.principal", "HIDDEN");
-      put("default.smoke.keytab", "HIDDEN");
-    }};
-    Map<String, Map<String, String>> visibilityMap = new HashMap<String, Map<String, String>>(){{
-      put("hive_webhcat_server_status", new HashMap<String, String>(){{
-        put("default.smoke.user", "HIDDEN");
-      }});
-      put("hive_metastore_process", defaultKeytabVisibilityMap);
-      put("hive_server_process", defaultKeytabVisibilityMap);
-      put("namenode_service_rpc_queue_latency_hourly", hdfsVisibilityMap);
-      put("namenode_client_rpc_queue_latency_hourly", hdfsVisibilityMap);
-      put("namenode_service_rpc_processing_latency_hourly", hdfsVisibilityMap);
-      put("namenode_client_rpc_processing_latency_hourly", hdfsVisibilityMap);
-      put("increase_nn_heap_usage_daily", hdfsVisibilityMap);
-      put("namenode_service_rpc_processing_latency_daily", hdfsVisibilityMap);
-      put("namenode_client_rpc_processing_latency_daily", hdfsVisibilityMap);
-      put("namenode_service_rpc_queue_latency_daily", hdfsVisibilityMap);
-      put("namenode_client_rpc_queue_latency_daily", hdfsVisibilityMap);
-      put("namenode_increase_in_storage_capacity_usage_daily", hdfsVisibilityMap);
-      put("increase_nn_heap_usage_weekly", hdfsVisibilityMap);
-      put("namenode_increase_in_storage_capacity_usage_weekly", hdfsVisibilityMap);
-    }};
-
-    // list of alerts that need to get property updates
-    List<String> alertNamesForPropertyUpdates = new ArrayList<String>() {{
-      add("namenode_service_rpc_queue_latency_hourly");
-      add("namenode_client_rpc_queue_latency_hourly");
-      add("namenode_service_rpc_processing_latency_hourly");
-      add("namenode_client_rpc_processing_latency_hourly");
-      add("increase_nn_heap_usage_daily");
-      add("namenode_service_rpc_processing_latency_daily");
-      add("namenode_client_rpc_processing_latency_daily");
-      add("namenode_service_rpc_queue_latency_daily");
-      add("namenode_client_rpc_queue_latency_daily");
-      add("namenode_increase_in_storage_capacity_usage_daily");
-      add("increase_nn_heap_usage_weekly");
-      add("namenode_increase_in_storage_capacity_usage_weekly");
-    }};
-
     LOG.info("Updating alert definitions.");
     AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
     AlertDefinitionDAO alertDefinitionDAO = injector.getInstance(AlertDefinitionDAO.class);
@@ -319,7 +270,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
     for (final Cluster cluster : clusterMap.values()) {
       long clusterID = cluster.getClusterId();
 
-      // here goes alerts that need get new properties
       final AlertDefinitionEntity namenodeLastCheckpointAlertDefinitionEntity = alertDefinitionDAO.findByName(
               clusterID, "namenode_last_checkpoint");
       final AlertDefinitionEntity namenodeHAHealthAlertDefinitionEntity = alertDefinitionDAO.findByName(
@@ -355,40 +305,16 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
       checkedPutToMap(alertDefinitionParams, flumeAgentStatusAlertDefinitionEntity,
               Lists.newArrayList("run.directory"));
 
-      List<AlertDefinitionEntity> definitionsForPropertyUpdates = new ArrayList<>();
-
-      // adding new properties
       for(Map.Entry<AlertDefinitionEntity, List<String>> entry : alertDefinitionParams.entrySet()){
         AlertDefinitionEntity alertDefinition = entry.getKey();
         String source = alertDefinition.getSource();
-        alertDefinition.setSource(addParam(source, entry.getValue()));
-        definitionsForPropertyUpdates.add(alertDefinition);
-      }
-
-      // here goes alerts that need update for existing properties
-      for(String name : alertNamesForPropertyUpdates) {
-        AlertDefinitionEntity alertDefinition = alertDefinitionDAO.findByName(clusterID, name);
-        if(alertDefinition != null) {
-          definitionsForPropertyUpdates.add(alertDefinition);
-        }
-      }
-
-      // updating old and new properties, best way to use map like visibilityMap.
-      for(AlertDefinitionEntity alertDefinition : definitionsForPropertyUpdates) {
-        // here goes property updates
-        if(visibilityMap.containsKey(alertDefinition.getDefinitionName())) {
-          for(Map.Entry<String, String> entry : visibilityMap.get(alertDefinition.getDefinitionName()).entrySet()){
-            String paramName = entry.getKey();
-            String visibilityValue = entry.getValue();
-            String source = alertDefinition.getSource();
-            alertDefinition.setSource(addParamOption(source, paramName, "visibility", visibilityValue));
-          }
-        }
 
-        // regeneration of hash and writing modified alerts to database, must go after all modifications finished
+        alertDefinition.setSource(addParam(source, entry.getValue()));
         alertDefinition.setHash(UUID.randomUUID().toString());
+
         alertDefinitionDAO.merge(alertDefinition);
       }
+
     }
   }
 
@@ -402,30 +328,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
     }
   }
 
-  /**
-   * Add option to script parameter.
-   * @param source json string of script source
-   * @param paramName parameter name
-   * @param optionName option name
-   * @param optionValue option value
-   * @return modified source
-   */
-  protected String addParamOption(String source, String paramName, String optionName, String optionValue){
-    JsonObject sourceJson = new JsonParser().parse(source).getAsJsonObject();
-    JsonArray parametersJson = sourceJson.getAsJsonArray("parameters");
-    if(parametersJson != null && !parametersJson.isJsonNull()) {
-      for(JsonElement param : parametersJson) {
-        if(param.isJsonObject()) {
-          JsonObject paramObject = param.getAsJsonObject();
-          if(paramObject.has("name") && paramObject.get("name").getAsString().equals(paramName)){
-            paramObject.add(optionName, new JsonPrimitive(optionValue));
-          }
-        }
-      }
-    }
-    return sourceJson.toString();
-  }
-
   protected String addParam(String source, List<String> params) {
     JsonObject sourceJson = new JsonParser().parse(source).getAsJsonObject();
     JsonArray parametersJson = sourceJson.getAsJsonArray("parameters");

ambari-server/src/main/python/ambari_server/serverUpgrade.py

@@ -51,11 +51,11 @@ from ambari_server.serverClassPath import ServerClassPath
 # constants
 STACK_NAME_VER_SEP = "-"
 
-SCHEMA_UPGRADE_HELPER_CMD = "{0} -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y -cp {1} " + \
+SCHEMA_UPGRADE_HELPER_CMD = "{0} -cp {1} " + \
                             "org.apache.ambari.server.upgrade.SchemaUpgradeHelper" + \
                             " > " + configDefaults.SERVER_OUT_FILE + " 2>&1"
 
-STACK_UPGRADE_HELPER_CMD = "{0} -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y -cp {1} " + \
+STACK_UPGRADE_HELPER_CMD = "{0} -cp {1} " + \
                            "org.apache.ambari.server.upgrade.StackUpgradeHelper" + \
                            " {2} {3} > " + configDefaults.SERVER_OUT_FILE + " 2>&1"
 

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json

@@ -537,8 +537,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -552,16 +551,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.datanode.RpcQueueTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -605,8 +602,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -620,16 +616,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.client.RpcQueueTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -673,8 +667,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -688,16 +681,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.datanode.RpcProcessingTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -741,8 +732,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -756,16 +746,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.client.RpcProcessingTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -809,8 +797,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -824,16 +811,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "jvm.JvmMetrics.MemHeapUsedM",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -870,8 +855,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -885,16 +869,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.datanode.RpcProcessingTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -938,8 +920,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -953,16 +934,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.client.RpcProcessingTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -1006,8 +985,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -1021,16 +999,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.datanode.RpcQueueTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -1074,8 +1050,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -1089,16 +1064,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "rpc.rpc.client.RpcQueueTimeAvgTime",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -1142,8 +1115,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -1157,16 +1129,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "dfs.FSNamesystem.CapacityUsed",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -1203,8 +1173,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -1218,16 +1187,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "jvm.JvmMetrics.MemHeapUsedM",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",
@@ -1264,8 +1231,7 @@
               "display_name": "Whether active and stanby NameNodes metrics should be merged",
               "value": "false",
               "type": "STRING",
-              "description": "Whether active and stanby NameNodes metrics should be merged.",
-              "visibility": "HIDDEN"
+              "description": "Whether active and stanby NameNodes metrics should be merged."
             },
             {
               "name": "interval",
@@ -1279,16 +1245,14 @@
               "display_name": "AMS application id",
               "value": "NAMENODE",
               "type": "STRING",
-              "description": "The application id used to retrieve the metric.",
-              "visibility": "HIDDEN"
+              "description": "The application id used to retrieve the metric."
             },
             {
               "name": "metricName",
               "display_name": "Metric Name",
               "value": "dfs.FSNamesystem.CapacityUsed",
               "type": "STRING",
-              "description": "The metric to monitor.",
-              "visibility": "HIDDEN"
+              "description": "The metric to monitor."
             },
             {
               "name": "metric.deviation.warning.threshold",

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json

@@ -33,16 +33,14 @@
               "display_name": "Default Smoke Principal",
               "value": "ambari-qa@EXAMPLE.COM",
               "type": "STRING",
-              "description": "The principal to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_principal_name",
-              "visibility": "HIDDEN"
+              "description": "The principal to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_principal_name"
             },
             {
               "name": "default.smoke.keytab",
               "display_name": "Default Smoke Keytab",
               "value": "/etc/security/keytabs/smokeuser.headless.keytab",
               "type": "STRING",
-              "description": "The keytab to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_keytab",
-              "visibility": "HIDDEN"
+              "description": "The keytab to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_keytab"
             }
           ]
         }
@@ -80,16 +78,14 @@
               "display_name": "Default Smoke Principal",
               "value": "ambari-qa@EXAMPLE.COM",
               "type": "STRING",
-              "description": "The principal to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_principal_name",
-              "visibility": "HIDDEN"
+              "description": "The principal to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_principal_name"
             },
             {
               "name": "default.smoke.keytab",
               "display_name": "Default Smoke Keytab",
               "value": "/etc/security/keytabs/smokeuser.headless.keytab",
               "type": "STRING",
-              "description": "The keytab to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_keytab",
-              "visibility": "HIDDEN"
+              "description": "The keytab to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_keytab"
             }
           ]
         }
@@ -157,8 +153,7 @@
               "display_name": "Default Smoke User",
               "value": "ambari-qa",
               "type": "STRING",
-              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser",
-              "visibility": "HIDDEN"
+              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser"
             },
             {
               "name": "connection.timeout",