marge: 合并11.2版本

This commit is contained in:
TsMask
2024-11-22 10:06:51 +08:00
parent 86ba2fb4a6
commit 1bdb13a2ab
67 changed files with 3536 additions and 3765 deletions

View File

@@ -119,17 +119,31 @@ esac
# create kpi_report table with ne_type, exp: kpi_report_amf
ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title")
for ne_type in ${ne_types}; do
TABLE_NAME="kpi_report_${ne_type}"
SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE ${TABLE_NAME} MODIFY COLUMN \`id\` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (\`id\`);"
echo -n "Create table: ${TABLE_NAME} ..."
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
if [ $? = 0 ]; then
echo "done"
fi
SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;"
echo -n "Create index of ${TABLE_NAME} ..."
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
if [ $? = 0 ]; then
echo "done"
fi
TABLE_NAME="kpi_report_${ne_type}"
SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_report\`;"
echo -n "Create table: ${TABLE_NAME} ..."
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
if [ $? = 0 ]; then
echo "done"
fi
SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;"
echo -n "Create index of ${TABLE_NAME} ..."
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
if [ $? = 0 ]; then
echo "done"
fi
SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE,ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;"
echo -n "Create index of ${TABLE_NAME} ..."
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"
if [ $? = 0 ]; then
echo "done"
fi
TABLE_NAME="kpi_c_report_${ne_type}"
SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_c_report\`;"
echo -n "Create table: ${TABLE_NAME} ..."
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
if [ $? = 0 ]; then
echo "done"
fi
done

View File

@@ -8,8 +8,11 @@ BinDir=/usr/local/omc/bin
case "$1" in
start)
for procName in $ProcListDesc;do
echo "Starting $procName process ..."
echo -n "Starting $procName process ... "
systemctl start $procName
if [ $? = 0 ]; then
echo "done"
fi
sleep 1
done
;;
@@ -20,8 +23,11 @@ case "$1" in
;;
stop)
for procName in $ProcList;do
echo "Stoping $procName process ..."
systemctl stop $procName
echo -n "Stopping $procName process ... "
systemctl stop $procName
if [ $? = 0 ]; then
echo "done"
fi
done
;;
restart)
@@ -31,12 +37,11 @@ case "$1" in
;;
version)
for procName in $ProcList;do
$BinDir/$procName -v
$BinDir/$procName --version
done
;;
*)
echo "OMC service"
echo "Usage: $0 start|status|stop|restart|version"
;;
esac
esac

View File

@@ -20,19 +20,22 @@ check_args() {
elif [ "${C_ARG_LOWER}" == "omc" ]; then
C_ARG_UPPER="OMC"
sed -i 's/VENDORS=.*/VENDORS=OMC/' /usr/local/omc/etc/omc.conf
elif [ "${C_ARG_LOWER}" == "agt" ]; then
C_ARG_UPPER="AGT"
sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf
fi
;;
m)
M_ARG=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
if [ "${VENDORS}" == "BA" ]; then
C_ARG_LOWER="ba"
C_ARG_UPPER="BA"
C_ARG_LOWER="ba"
C_ARG_UPPER="BA"
fi
;;
\?)
echo "Invalid option: -$OPTARG" >&2
;;
esac
esac
done
}
@@ -54,19 +57,26 @@ case "${M_ARG}" in
${OMCBinDir}/importdb.sh ${M_ARG}
if [ "${C_ARG_LOWER}" != "" ]; then
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
echo "Setting ${C_ARG_UPPER} customized OMC ..."
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
echo -n "Setting ${C_ARG_UPPER} customized OMC ..."
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
if [ "${C_ARG_LOWER}" == "ba" ]; then
rm -rf ${OMCStaticDir}/logo/zh_*
rm -rf ${OMCStaticDir}/helpDoc/zh_*
fi
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
if [ $? = 0 ]; then
echo "done"
fi
fi
;;
upgrade | upgvue3)
@@ -74,17 +84,24 @@ case "${M_ARG}" in
;;
skip)
if [ "${C_ARG_LOWER}" != "" ]; then
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
echo "Setting ${C_ARG_UPPER} customized OMC ..."
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
if [ ! -d "${CustomizedDir}" ]; then
echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
exit 1
fi
echo -n "Setting ${C_ARG_UPPER} customized OMC ..."
for SQL in ${CustomizedDir}/db/*.sql; do
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
done
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
if [ "${C_ARG_LOWER}" == "ba" ]; then
rm -rf ${OMCStaticDir}/logo/zh_*
rm -rf ${OMCStaticDir}/helpDoc/zh_*
fi
if [ $? = 0 ]; then
echo "done"
fi
fi
;;
*)

62
misc/upgconf.sh Normal file
View File

@@ -0,0 +1,62 @@
#!/bin/bash
config_file="/usr/local/omc/etc/restconf.yaml"
temp_file="/tmp/temp.yaml"
declare -A insert_lines=(
[156]=" dataCoding: 0"
[157]=" serviceNumber: \"OMC\""
)
declare -A update_lines=(
["deadLine: 10"]="deadLine: 600"
)
# check if exist file
if [[ ! -f $config_file ]]; then
echo "NOT FOUND config file: $config_file"
exit 1
fi
insert_if_missing() {
local line_number="$1"
local line_content="$2"
local current_content=$(sed -n "${line_number}p" "$config_file")
if [[ "$current_content" != "$line_content" ]]; then
# insert line to config file
echo -n "Inserting '$line_content' into line ${line_number} ... "
awk -v n="$line_number" -v line="$line_content" 'NR==n {print line} {print}' "$config_file" >"$temp_file" && mv "$temp_file" "$config_file"
if [ $? = 0 ]; then
echo "done"
fi
else
echo "Exist '$line_content' at line ${line_number}"
fi
}
# functionupdate line content
update_lines_content() {
local old_line="$1"
local new_line="$2"
echo -n "Updating '$old_line' to line '$new_line' ..."
sed -i "s/$old_line/$new_line/" "$config_file"
if [ $? = 0 ]; then
echo "done"
fi
}
#line_numbers=(156 157)
line_numbers=$(for key in "${!insert_lines[@]}"; do echo "$key"; done | sort -n)
# insert process
#for line_number in "${line_numbers[@]}"; do
#for line_number in "${!insert_lines[@]}"; do
for line_number in $line_numbers; do
insert_if_missing "$line_number" "${insert_lines[$line_number]}"
done
# update process
for old_line in "${!update_lines[@]}"; do
update_lines_content "$old_line" "${update_lines[$old_line]}"
done