From 90b53a74e6ab72a304e99b8b7dd12c2e3bd29edd Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Fri, 9 Oct 2015 19:55:03 +0200 Subject: [PATCH] finish renaming script names --- .../alias.d/50-trc6500-master-file.csv | 32 ++++++++++------- .../script/change_lgcore} | 0 master/opt/script/cpuclock | 16 +++++++++ ...ntegration.tcl => conf_switch_integration} | 0 master/root/bin/cpumon_light | 36 ------------------- ...sh => deploiement_conf_reseau_integration} | 2 +- 6 files changed, 37 insertions(+), 49 deletions(-) rename master/{root/bin/change_lgcore.sh => opt/script/change_lgcore} (100%) create mode 100644 master/opt/script/cpuclock rename master/root/bin/{conf_switch_integration.tcl => conf_switch_integration} (100%) delete mode 100755 master/root/bin/cpumon_light rename master/root/bin/{deploiement_conf_reseau_integration.sh => deploiement_conf_reseau_integration} (97%) diff --git a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv index d393d42..dc65735 100644 --- a/master/etc/webconfig/alias.d/50-trc6500-master-file.csv +++ b/master/etc/webconfig/alias.d/50-trc6500-master-file.csv @@ -46,15 +46,23 @@ ipmi;/usr/share/webconfig;;Configure IPMI for all Supermicro blades;sudo /opt/sc /dce;/usr/share/dce;/etc/dhcp/dhcpd.conf;DHCPD Configuration Editor;sudo service isc-dhcp-server restart ntp;/usr/share/webconfig;;Synchronize time and date on all blades;sudo /opt/script/check_network -c 'service chrony stop; ntpdate-debian; service chrony start' -o ;;;Internal equipements; -http://10.133.26.160:8110;/usr/share/webconfig;;FE306-1;:goto: -http://10.133.26.160:8120;/usr/share/webconfig;;FE306-2;:goto: -http://10.133.26.160:8130;/usr/share/webconfig;;FE306-3;:goto: -http://10.133.26.160:8140;/usr/share/webconfig;;FE306-4;:goto: -http://10.133.26.160:8150;/usr/share/webconfig;;FE306-5;:goto: -http://10.133.26.231;/usr/share/webconfig;;Switch Monitoring;:goto: -http://10.133.26.160:8231;/usr/share/webconfig;;Switch Gonio 1;:goto: -http://10.133.26.160:8232;/usr/share/webconfig;;Switch Gonio 2;:goto: -http://10.133.26.254;/usr/share/webconfig;;GPS;:goto: +http://10.133.28.160:8110;/usr/share/webconfig;;FE306-1;:goto: +http://10.133.26.160:8110;/usr/share/webconfig;;FE306-1 (lite);:goto: +http://10.133.28.160:8120;/usr/share/webconfig;;FE306-2;:goto: +http://10.133.26.160:8120;/usr/share/webconfig;;FE306-2 (lite);:goto: +http://10.133.28.160:8130;/usr/share/webconfig;;FE306-3;:goto: +http://10.133.26.160:8130;/usr/share/webconfig;;FE306-3 (lite);:goto: +http://10.133.28.160:8140;/usr/share/webconfig;;FE306-4;:goto: +http://10.133.26.160:8140;/usr/share/webconfig;;FE306-4 (lite);:goto: +http://10.133.28.160:8150;/usr/share/webconfig;;FE306-5;:goto: +http://10.133.26.160:8150;/usr/share/webconfig;;FE306-5 (lite);:goto: +http://10.133.28.231;/usr/share/webconfig;;Switch Monitoring;:goto: +http://10.133.28.160:8231;/usr/share/webconfig;;Switch Gonio 1;:goto: +http://10.133.26.160:8231;/usr/share/webconfig;;Switch 1 (lite);:goto: +http://10.133.28.160:8232;/usr/share/webconfig;;Switch Gonio 2;:goto: +http://10.133.26.160:8232;/usr/share/webconfig;;Switch 2 (lite);:goto: +http://10.133.28.254;/usr/share/webconfig;;GPS;:goto: +http://10.133.26.254;/usr/share/webconfig;;GPS (lite);:goto: ;;;TRC6500 MIB; /swb;/usr/share/swb;/var/cache/webconfig/snmp.tree;SNMP Web Browser;/opt/trc6500/bin/snmp-trc6500-walk|sed 's/enterprises\.thales\.//'>/var/cache/webconfig/snmp.tree ;;;Chassis actions; @@ -69,7 +77,7 @@ mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/script/se 12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/script/change_configuration 12MHzDF 12mhzmdf;/usr/share/webconfig;;Setup 12MHzMDF mode;sudo /opt/script/change_configuration 12MHzMDF 30mhzmdf;/usr/share/webconfig;;Setup 30MHzMDF mode;sudo /opt/script/change_configuration 30MHzMDF -30mhzmdf.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/script/change_configuration 30MHzMDF.lite +30mhzmdf.lite.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/script/change_configuration 30MHzMDF.lite 30mhzmhf;/usr/share/webconfig;;Setup 30MHzMHF mode;sudo /opt/script/change_configuration 30MHzMHF hw_ibm;/usr/share/webconfig;;Setup IBM HS22 chassis mode;sudo /opt/script/change_configuration hw_ibm hw_supermicro;/usr/share/webconfig;;Setup FatTwin Supermicro chassis mode;sudo /opt/script/change_configuration hw_supermicro @@ -77,5 +85,5 @@ tz_zulu;/usr/share/webconfig;;Setup Zulu timezone;sudo /opt/script/change_config tz_paris;/usr/share/webconfig;;Setup Europe/Paris timezone;sudo /opt/script/change_configuration tz_paris tarballs;/usr/share/webconfig;;Build tarballs;sudo make -f /opt/cluster/Makefile all ;;;Install LgCore actions; -install-usb;/usr/share/webconfig;;Install LgCore from USB key;sudo /root/bin/change_lgcore.sh usb -install-file;/usr/share/webconfig;;Install LgCore from local file;sudo /root/bin/change_lgcore.sh file -r /var/cache/webconfig +install-usb;/usr/share/webconfig;;Install LgCore from USB key;sudo /opt/script/change_lgcore usb +install-file;/usr/share/webconfig;;Install LgCore from local file;sudo /opt/script/change_lgcore file -r /var/cache/webconfig diff --git a/master/root/bin/change_lgcore.sh b/master/opt/script/change_lgcore similarity index 100% rename from master/root/bin/change_lgcore.sh rename to master/opt/script/change_lgcore diff --git a/master/opt/script/cpuclock b/master/opt/script/cpuclock new file mode 100644 index 0000000..21d7e2a --- /dev/null +++ b/master/opt/script/cpuclock @@ -0,0 +1,16 @@ +#!/usr/bin/awk -f + +BEGIN { + ARGV[1]="/proc/cpuinfo" + ARGC=2 +} + +/MHz/ { + cpu[$4]++ +} + +END { + for (i in cpu) + printf " %s x %d", i, cpu[i] + printf "\n" +} diff --git a/master/root/bin/conf_switch_integration.tcl b/master/root/bin/conf_switch_integration similarity index 100% rename from master/root/bin/conf_switch_integration.tcl rename to master/root/bin/conf_switch_integration diff --git a/master/root/bin/cpumon_light b/master/root/bin/cpumon_light deleted file mode 100755 index af635c1..0000000 --- a/master/root/bin/cpumon_light +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/perl - -use strict; - -my @cpu_stat_t0 = proc_stat(); -sleep 1; -my @cpu_stat_t1 = proc_stat(); -my $total = 0; -for (my $cpu_i = 0; $cpu_i < (scalar @cpu_stat_t0); $cpu_i++) { - my @stat_t0 = split /\s+/, $cpu_stat_t0[$cpu_i]; - my @stat_t1 = split /\s+/, $cpu_stat_t1[$cpu_i]; - my ($t0_idle, $t1_idle) = ($stat_t0[3], $stat_t1[3]); - my ($t0_total, $t1_total) = (0, 0); - $t0_total += $_ foreach @stat_t0; - $t1_total += $_ foreach @stat_t1; - - my $load = ($t1_total - $t0_total == 0) ? 100: - int((100 * (($t1_total - $t0_total) - ($t1_idle - $t0_idle))/($t1_total - $t0_total)) + 0.5); - print " +" unless ($cpu_i == 0); - printf "% 5.1f%% ", $load; - $total += $load; -} -printf " = % 6.1f%%\n", $total; - -sub proc_stat() { - return grep {s/^cpu\d+\s//} read_file('/proc/stat'); -} - -sub read_file($) { - my ($file) = @_; - open FILE, "<$file"; - my @content = ; - close FILE; - return @content; -} - diff --git a/master/root/bin/deploiement_conf_reseau_integration.sh b/master/root/bin/deploiement_conf_reseau_integration similarity index 97% rename from master/root/bin/deploiement_conf_reseau_integration.sh rename to master/root/bin/deploiement_conf_reseau_integration index c0bcfd1..fffec88 100755 --- a/master/root/bin/deploiement_conf_reseau_integration.sh +++ b/master/root/bin/deploiement_conf_reseau_integration @@ -52,7 +52,7 @@ if [ $SWITCH -eq 1 ]; then mydir=$(dirname $0) [ "$mydir" ] || mydir=. [[ "$mydir" =~ ^/ ]] || mydir=$(cd $mydir; pwd) - $mydir/conf_switch_integration.tcl $SUB + $mydir/conf_switch_integration $SUB fi # Ajout des depots debian -- 2.30.2