Additional sub-commands ; updated README.MD

Author: svrnm

README.md

@@ -25,41 +25,59 @@ adc.sh config -f
 `adc.sh` integrates different commands to interact with your AppDynamics controller. Call `adc.sh help` to get a full list:
 
 ```
-Usage: ./adc.sh <namespace> <command>
-
-To execute a action, provide a namespace and a command, e.g. "dbmon list" to list all database collectors.
+Usage: adc.sh [-H <controller-host>] [-C <controller-credentials>] [-D <output-verbosity>] [-P <plugin-directory>] [-A <application-name>] <namespace> <command>
+
+You can use the following options on a global level:
+	-H <controller-host>		 specify the host of the controller you want to connect to
+	-C <controller-credentials>	 provide the credentials for the controller. Format: user@tenant:password
+	-D <output-verbosity>		 Change the output verbosity. Provide a list of the following values: debug,error,warn,info,output
+	-D <application-name>		 Provide a default application
+To execute a action, provide a namespace and a command, e.g. "metrics get" to get a specific metric.
 Finally the following commands in the global namespace can be called directly:
+	config		Initialize the adc configuration file
 	help		Display the global usage information
-	config	Initialize the adc configuration file
+	install		Run through the process of setting up the appdynamics plattform
 
 application
+	export		Export an application from the controller
 	list		List all applications available on the controller
 
 controller
 	call		Send a custom HTTP call to a controller
 	login		Login to your controller
 	ping		Check the availability of an appdynamics controller
 	status		Get server status from controller
+	version		Get installed version from controller
 
 dashboard
 	delete		Delete a specific dashboard
 	export		Export a specific dashboard
+	import		Import a dashboard
 	list		List all dashboards available on the controller
 
 dbmon
 	create		Create a new database collector
+	delete		Delete a database collector
+	list		List all database collectors
 
 event
 	create		Create a custom event for a given application
 
-metrics
-	get		List all metrics available for one application
-	list		List all metrics available for one application
+metric
+	get		Get a specific metric
+	list		List metrics available for one application.
+	tree		Build and return a metrics tree for one application
+
+portal
+	download		Download an appdynamics agent
+	login		Login to portal.appdynamics.com
 
 timerange
 	create		Create a custom time range
 	delete		Delete a specific time range by id
 	list		List all custom timeranges available on the controller
+
+Run adc.sh help <namespace> to get detailed help on subcommands in that namespace.
 ```
 
 A simple work flow example is listing, exporting and deleting a dashboard:

adc.sh

@@ -57,6 +57,7 @@ function output {
   fi
 }
 function httpClient {
+ debug "$*"
  curl -L --connect-timeout 10 "$@"
 }
 SHIFTS=0
@@ -243,7 +244,8 @@ EOF
 function controller_call {
   debug "Calling $CONFIG_CONTROLLER_HOST"
   local METHOD="GET"
-  while getopts "X:d:" opt "$@";
+  local FORM=""
+  while getopts "X:d:F:" opt "$@";
   do
     case "${opt}" in
       X)
@@ -252,6 +254,9 @@ function controller_call {
       d)
         PAYLOAD=${OPTARG}
       ;;
+      F)
+        FORM=${OPTARG}
+      ;;
     esac
   done
   shiftOptInd
@@ -264,9 +269,10 @@ function controller_call {
     COMMAND_RESULT=$(httpClient -s -b $CONFIG_CONTROLLER_COOKIE_LOCATION \
           -X $METHOD\
           -H "X-CSRF-TOKEN: $XCSRFTOKEN" \
-          -H "Content-Type: application/json;charset=UTF-8" \
+          "`[ -z "$FORM" ] && echo -H "Content-Type: application/json;charset=UTF-8"`" \
           -H "Accept: application/json, text/plain, */*"\
-          -d "$PAYLOAD" \
+          "`[ -n "$PAYLOAD" ] && echo -d ${PAYLOAD}`" \
+          "`[ -n "$FORM" ] && echo -F ${FORM}`" \
           $CONFIG_CONTROLLER_HOST$ENDPOINT)
    else
      COMMAND_RESULT="Controller Login Error! Please check hostname and credentials"
@@ -424,6 +430,19 @@ register application_list List all applications available on the controller
 describe application_list << EOF
 List all applications available on the controller. This command requires no further arguments.
 EOF
+function application_export {
+  local APPLICATION_ID=$*
+  if [[ $APPLICATION_ID =~ ^[0-9]+$ ]]; then
+    controller_call /controller/ConfigObjectImportExportServlet?applicationId=97
+  else
+    COMMAND_RESULT=""
+    error "This is not a number: '$APPLICATION_ID'"
+  fi
+}
+register application_export Export an application from the controller
+describe application_export << EOF
+Export a application from the controller. Specifiy the application id as parameter.
+EOF
 function metric_list {
   local APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local METRIC_PATH=""
@@ -600,6 +619,26 @@ register dbmon_create Create a new database collector
 describe dbmon_create << EOF
 Create a new database collector
 EOF
+function dbmon_list {
+  controller_call /controller/restui/databases/collectors/
+}
+register dbmon_list List all database collectors
+describe dbmon_list << EOF
+List all database collectors
+EOF
+function dbmon_delete {
+  local COLLECTOR_ID=$*
+  if [[ $COLLECTOR_ID =~ ^[0-9]+$ ]]; then
+    controller_call -X POST -d "[$COLLECTOR_ID]" /controller/restui/databases/collectors/configuration/batchDelete
+  else
+    COMMAND_RESULT=""
+    error "This is not a number: '$COLLECTOR_ID'"
+  fi
+}
+register dbmon_delete Delete a database collector
+describe dbmon_delete << EOF
+Delete a database collector. Provide the collector id as parameter.
+EOF
 function event_create {
   local APPLICATION=${CONFIG_CONTROLLER_DEFAULT_APPLICATION}
   local NODE
@@ -713,6 +752,19 @@ register dashboard_export Export a specific dashboard
 describe dashboard_export << EOF
 Export a specific dashboard
 EOF
+function dashboard_import {
+  FILE="$*"
+  if [ -r $FILE ] ; then
+    controller_call -X POST -F file=@$FILE /controller/CustomDashboardImportExportServlet
+  else
+    COMMAND_RESULT=""
+    error "File not found or not readable: $FILE"
+  fi
+}
+register dashboard_import Import a dashboard
+describe dashboard_import << EOF
+Import a dashboard from a given file
+EOF
 function dashboard_delete {
   local DASHBOARD_ID=$*
   if [[ $DASHBOARD_ID =~ ^[0-9]+$ ]]; then

commands/application/export.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+function application_export {
+  local APPLICATION_ID=$*
+  if [[ $APPLICATION_ID =~ ^[0-9]+$ ]]; then
+    controller_call /controller/ConfigObjectImportExportServlet?applicationId=97
+  else
+    COMMAND_RESULT=""
+    error "This is not a number: '$APPLICATION_ID'"
+  fi
+
+}
+
+register application_export Export an application from the controller
+
+describe application_export << EOF
+Export a application from the controller. Specifiy the application id as parameter.
+EOF

commands/controller/call.sh

@@ -3,7 +3,8 @@
 function controller_call {
   debug "Calling $CONFIG_CONTROLLER_HOST"
   local METHOD="GET"
-  while getopts "X:d:" opt "$@";
+  local FORM=""
+  while getopts "X:d:F:" opt "$@";
   do
     case "${opt}" in
       X)
@@ -12,6 +13,9 @@ function controller_call {
       d)
         PAYLOAD=${OPTARG}
       ;;
+      F)
+        FORM=${OPTARG}
+      ;;
     esac
   done
 
@@ -27,9 +31,10 @@ function controller_call {
     COMMAND_RESULT=$(httpClient -s -b $CONFIG_CONTROLLER_COOKIE_LOCATION \
           -X $METHOD\
           -H "X-CSRF-TOKEN: $XCSRFTOKEN" \
-          -H "Content-Type: application/json;charset=UTF-8" \
+          "`[ -z "$FORM" ] && echo -H "Content-Type: application/json;charset=UTF-8"`" \
           -H "Accept: application/json, text/plain, */*"\
-          -d "$PAYLOAD" \
+          "`[ -n "$PAYLOAD" ] && echo -d ${PAYLOAD}`" \
+          "`[ -n "$FORM" ] && echo -F ${FORM}`" \
           $CONFIG_CONTROLLER_HOST$ENDPOINT)
    else
      COMMAND_RESULT="Controller Login Error! Please check hostname and credentials"

commands/dashboard/import.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+function dashboard_import {
+  FILE="$*"
+  if [ -r $FILE ] ; then
+    controller_call -X POST -F file=@$FILE /controller/CustomDashboardImportExportServlet
+  else
+    COMMAND_RESULT=""
+    error "File not found or not readable: $FILE"
+  fi
+}
+
+register dashboard_import Import a dashboard
+describe dashboard_import << EOF
+Import a dashboard from a given file
+EOF

commands/dbmon/delete.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+function dbmon_delete {
+  local COLLECTOR_ID=$*
+  if [[ $COLLECTOR_ID =~ ^[0-9]+$ ]]; then
+    controller_call -X POST -d "[$COLLECTOR_ID]" /controller/restui/databases/collectors/configuration/batchDelete
+  else
+    COMMAND_RESULT=""
+    error "This is not a number: '$COLLECTOR_ID'"
+  fi
+}
+
+register dbmon_delete Delete a database collector
+describe dbmon_delete << EOF
+Delete a database collector. Provide the collector id as parameter.
+EOF

commands/dbmon/list.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+function dbmon_list {
+  controller_call /controller/restui/databases/collectors/
+}
+
+register dbmon_list List all database collectors
+describe dbmon_list << EOF
+List all database collectors
+EOF

helpers/httpClient.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 function httpClient {
+ debug "$*"
  curl -L --connect-timeout 10 "$@"
 }

main.sh

@@ -52,12 +52,15 @@ source ./commands/portal/login.sh
 source ./commands/portal/download.sh
 
 source ./commands/application/list.sh
+source ./commands/application/export.sh
 
 source ./commands/metric/list.sh
 source ./commands/metric/get.sh
 source ./commands/metric/tree.sh
 
 source ./commands/dbmon/create.sh
+source ./commands/dbmon/list.sh
+source ./commands/dbmon/delete.sh
 
 source ./commands/event/create.sh
 
@@ -67,6 +70,7 @@ source ./commands/timerange/delete.sh
 
 source ./commands/dashboard/list.sh
 source ./commands/dashboard/export.sh
+source ./commands/dashboard/import.sh
 source ./commands/dashboard/delete.sh
 
 if [ -f "${GLOBAL_CONFIG}" ]; then