tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qfix' into 'develop' 

Minor fix

See merge request artica/pandorafms!1168
This commit is contained in:
vgilc 2017-12-07 12:22:11 +01:00
parent 633cb5a39c b6d2bdcc71
commit 240759cc87
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_plugins/EC2/ec2_cloudwatch_plugin.sh
View File

@ -17,8 +17,8 @@ function help {
echo " " echo " "
echo "This plugin is used to check performance of Volumes and Instances in the EC2 Cloud" echo "This plugin is used to check performance of Volumes and Instances in the EC2 Cloud"
echo "Syntax:" echo "Syntax:"
echo -e "\t\t-A Access KEY ID, p.e AKIAILTVJ3S26GTKLD4A" echo -e "\t\t-A Access KEY ID, p.e AKIAILTVCAS26GTKLD4A"
echo -e "\t\t-S Secret Access Key, p.e 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" echo -e "\t\t-S Secret Access Key, p.e CgmQ6DxUWES05txju+alJLoM57acDudHogkLotWk"
echo -e "\t\t-R Region, p.e us-east-1" echo -e "\t\t-R Region, p.e us-east-1"
echo -e "\t\t-m Metric to gather (see doc for a metric list) " echo -e "\t\t-m Metric to gather (see doc for a metric list) "
echo -e "\t\t-n Namespace (p.e: AWS/EC2, AWS/EBS) " echo -e "\t\t-n Namespace (p.e: AWS/EC2, AWS/EBS) "
@ -27,7 +27,7 @@ function help {
echo -e "\t\t-z Show default metrics " echo -e "\t\t-z Show default metrics "
echo -e "\t\t-h Show this messages " echo -e "\t\t-h Show this messages "
echo "Samples:" echo "Samples:"
echo " ./ec2_plugin.sh -A AKIAILTVJ3S26GTKLD4A -S CgmQ6DxUWES05txfe+juJLoM57acDudHogkLotWk -i i-9d0b4af1 -n AWS/EC2 -m CPUUtilization" echo " ./ec2_plugin.sh -A AKIAILTVCAS26GTKLD4A -S CgmQ6DxUWES05txju+alJLoM57acDudHogkLotWk -i i-9d0b4af1 -n AWS/EC2 -m CPUUtilization"
echo echo
exit 0 exit 0

4
pandora_plugins/EC2/ec2_describe_instance.sh
View File

@ -20,8 +20,8 @@ function help {
echo " ./$progname [-A access-key -S secret-key][-R region] -f config -i instance-id -n field-name" echo " ./$progname [-A access-key -S secret-key][-R region] -f config -i instance-id -n field-name"
echo -e "\t\t-f path of configu file" echo -e "\t\t-f path of configu file"
echo -e "\t\t-R Region, p.e us-east-1" echo -e "\t\t-R Region, p.e us-east-1"
echo -e "\t\t-A Access KEY ID, p.e AKIAILTVJ3S26GTKLD4A" echo -e "\t\t-A Access KEY ID, p.e AKIAILTVCAS26GTKLD4A"
echo -e "\t\t-S Secret Access Key, p.e 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" echo -e "\t\t-S Secret Access Key, p.e CgmQ6DxUWES05txju+alJLoM57acDudHogkLotWk"
echo -e "\t\t-i Instance ID, p.e i-9d0b4af1" echo -e "\t\t-i Instance ID, p.e i-9d0b4af1"
echo -e "\t\t-n Field Name, p.e type, public-dns, .." echo -e "\t\t-n Field Name, p.e type, public-dns, .."
echo -e "\t\t-h Show this messages" echo -e "\t\t-h Show this messages"