1 diff --git a/tools/collector/scripts/collect b/tools/collector/scripts/collect
2 index 88e373e..666df9e 100755
3 --- a/tools/collector/scripts/collect
4 +++ b/tools/collector/scripts/collect
5 @@ -83,7 +83,7 @@ if [ ${UID} -eq 0 ]; then
8 # pull in common utils and environment
9 -source /usr/local/sbin/collect_utils
10 +source /usr/sbin/collect_utils
11 source_openrc_if_needed
14 @@ -121,7 +121,7 @@ SCP_TIMEOUT="600"
15 SSH_CMD="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PreferredAuthentications=password -o PubkeyAuthentication=no"
16 NOWDATE=`date +"%Y%m%d.%H%M%S"`
17 COLLECT_BASE_DIR="/scratch"
18 -collect_host="/usr/local/sbin/collect_host"
19 +collect_host="/usr/sbin/collect_host"
23 diff --git a/tools/collector/scripts/collect_ceph.sh b/tools/collector/scripts/collect_ceph.sh
24 index 1a5863e..d4dbcfc 100755
25 --- a/tools/collector/scripts/collect_ceph.sh
26 +++ b/tools/collector/scripts/collect_ceph.sh
30 # Loads Up Utilities and Commands Variables
31 -source /usr/local/sbin/collect_parms
32 -source /usr/local/sbin/collect_utils
33 +source /usr/sbin/collect_parms
34 +source /usr/sbin/collect_utils
37 LOGFILE="${extradir}/ceph.info"
38 diff --git a/tools/collector/scripts/collect_containerization.sh b/tools/collector/scripts/collect_containerization.sh
39 index d2e5a92..fb2fa7a 100755
40 --- a/tools/collector/scripts/collect_containerization.sh
41 +++ b/tools/collector/scripts/collect_containerization.sh
44 # Loads Up Utilities and Commands Variables
46 -source /usr/local/sbin/collect_parms
47 -source /usr/local/sbin/collect_utils
48 +source /usr/sbin/collect_parms
49 +source /usr/sbin/collect_utils
51 SERVICE="containerization"
52 LOGFILE="${extradir}/${SERVICE}.info"
53 diff --git a/tools/collector/scripts/collect_coredump.sh b/tools/collector/scripts/collect_coredump.sh
54 index 7614909..7702ef2 100644
55 --- a/tools/collector/scripts/collect_coredump.sh
56 +++ b/tools/collector/scripts/collect_coredump.sh
59 # Loads Up Utilities and Commands Variables
61 -source /usr/local/sbin/collect_parms
62 -source /usr/local/sbin/collect_utils
63 +source /usr/sbin/collect_parms
64 +source /usr/sbin/collect_utils
67 LOGFILE="${extradir}/${SERVICE}.info"
68 diff --git a/tools/collector/scripts/collect_crash.sh b/tools/collector/scripts/collect_crash.sh
69 index fc8c798..c768306 100644
70 --- a/tools/collector/scripts/collect_crash.sh
71 +++ b/tools/collector/scripts/collect_crash.sh
74 # Loads Up Utilities and Commands Variables
76 -source /usr/local/sbin/collect_parms
77 -source /usr/local/sbin/collect_utils
78 +source /usr/sbin/collect_parms
79 +source /usr/sbin/collect_utils
82 LOGFILE="${extradir}/${SERVICE}.info"
83 diff --git a/tools/collector/scripts/collect_date b/tools/collector/scripts/collect_date
84 index 22c62fb..60724b8 100755
85 --- a/tools/collector/scripts/collect_date
86 +++ b/tools/collector/scripts/collect_date
91 -# /usr/local/sbin/collect_date <start_date> <end_date> <include_list> <debug>
92 -# /usr/local/sbin/collect_date 20170701 20170901 /tmp/file.list true
93 +# /usr/sbin/collect_date <start_date> <end_date> <include_list> <debug>
94 +# /usr/sbin/collect_date 20170701 20170901 /tmp/file.list true
96 ########################################################################
99 # Import commands, variables and convenience functions available to
100 # all collectors ; common and user defined.
102 -source /usr/local/sbin/collect_utils
103 +source /usr/sbin/collect_utils
105 # where to find the logs
106 declare -r baselogdir="/var/log"
107 diff --git a/tools/collector/scripts/collect_fm.sh b/tools/collector/scripts/collect_fm.sh
108 index 4ef489a..9ea432b 100644
109 --- a/tools/collector/scripts/collect_fm.sh
110 +++ b/tools/collector/scripts/collect_fm.sh
113 # Loads Up Utilities and Commands Variables
115 -source /usr/local/sbin/collect_parms
116 -source /usr/local/sbin/collect_utils
117 +source /usr/sbin/collect_parms
118 +source /usr/sbin/collect_utils
121 LOGFILE="${extradir}/${SERVICE}.info"
122 diff --git a/tools/collector/scripts/collect_host b/tools/collector/scripts/collect_host
123 index e94177a..9a47763 100755
124 --- a/tools/collector/scripts/collect_host
125 +++ b/tools/collector/scripts/collect_host
126 @@ -26,7 +26,7 @@ export ACTIVE=false
127 # Import commands, variables and convenience functions available to
128 # all collectors ; common and user defined.
130 -source /usr/local/sbin/collect_utils
131 +source /usr/sbin/collect_utils
132 source_openrc_if_needed
135 @@ -83,7 +83,7 @@ FLIGHT_RECORDER_FILE="sm.eru.v1"
136 VAR_LOG_INCLUDE_LIST="/tmp/${COLLECT_NAME}.lst"
137 COLLECT_DIR_PCENT_CMD="df --output=pcent ${COLLECT_BASE_DIR}"
138 COLLECT_DIR_USAGE_CMD="df -h ${COLLECT_BASE_DIR}"
139 -COLLECT_DATE="/usr/local/sbin/collect_date"
140 +COLLECT_DATE="/usr/sbin/collect_date"
144 @@ -440,8 +440,8 @@ log_space "after delete tar ....:"
146 if [ "${SKIP_MASK}" != "true" ]; then
147 # Run password masking before final tar
148 - dlog "running /usr/local/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}"
149 - /usr/local/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}
150 + dlog "running /usr/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}"
151 + /usr/sbin/collect_mask_passwords ${COLLECT_NAME_DIR} ${EXTRA_DIR}
152 log_space "after passwd masking :"
155 diff --git a/tools/collector/scripts/collect_ima.sh b/tools/collector/scripts/collect_ima.sh
156 index 14c751e..0ac63b3 100755
157 --- a/tools/collector/scripts/collect_ima.sh
158 +++ b/tools/collector/scripts/collect_ima.sh
162 # Loads Up Utilities and Commands Variables
163 -source /usr/local/sbin/collect_parms
164 -source /usr/local/sbin/collect_utils
165 +source /usr/sbin/collect_parms
166 +source /usr/sbin/collect_utils
168 function is_extended_profile {
169 if [ ! -n "${security_profile}" ] || [ "${security_profile}" != "extended" ]; then
170 diff --git a/tools/collector/scripts/collect_networking.sh b/tools/collector/scripts/collect_networking.sh
171 index 98f4136..140e85d 100755
172 --- a/tools/collector/scripts/collect_networking.sh
173 +++ b/tools/collector/scripts/collect_networking.sh
176 # Loads Up Utilities and Commands Variables
178 -source /usr/local/sbin/collect_parms
179 -source /usr/local/sbin/collect_utils
180 +source /usr/sbin/collect_parms
181 +source /usr/sbin/collect_utils
184 LOGFILE="${extradir}/${SERVICE}.info"
185 diff --git a/tools/collector/scripts/collect_nfv_vim.sh b/tools/collector/scripts/collect_nfv_vim.sh
186 index c5ccbc7..37189c5 100644
187 --- a/tools/collector/scripts/collect_nfv_vim.sh
188 +++ b/tools/collector/scripts/collect_nfv_vim.sh
192 # Loads Up Utilities and Commands Variables
193 -source /usr/local/sbin/collect_parms
194 -source /usr/local/sbin/collect_utils
195 +source /usr/sbin/collect_parms
196 +source /usr/sbin/collect_utils
198 LOGFILE="${extradir}/nfv-vim.info"
199 echo "${hostname}: NFV-Vim Info ......: ${LOGFILE}"
200 diff --git a/tools/collector/scripts/collect_openstack.sh b/tools/collector/scripts/collect_openstack.sh
201 index e03eca8..a14c8f3 100755
202 --- a/tools/collector/scripts/collect_openstack.sh
203 +++ b/tools/collector/scripts/collect_openstack.sh
207 # Loads Up Utilities and Commands Variables
208 -source /usr/local/sbin/collect_parms
209 -source /usr/local/sbin/collect_utils
210 +source /usr/sbin/collect_parms
211 +source /usr/sbin/collect_utils
213 function is_service_active {
214 active=`sm-query service rabbit-fs | grep "enabled-active"`
215 diff --git a/tools/collector/scripts/collect_ovs.sh b/tools/collector/scripts/collect_ovs.sh
216 index 94e98e6..cdf4680 100644
217 --- a/tools/collector/scripts/collect_ovs.sh
218 +++ b/tools/collector/scripts/collect_ovs.sh
221 # Loads Up Utilities and Commands Variables
223 -source /usr/local/sbin/collect_parms
224 -source /usr/local/sbin/collect_utils
225 +source /usr/sbin/collect_parms
226 +source /usr/sbin/collect_utils
229 LOGFILE="${extradir}/${SERVICE}.info"
230 diff --git a/tools/collector/scripts/collect_patching.sh b/tools/collector/scripts/collect_patching.sh
231 index 3d696d2..05ba41e 100755
232 --- a/tools/collector/scripts/collect_patching.sh
233 +++ b/tools/collector/scripts/collect_patching.sh
237 # Loads Up Utilities and Commands Variables
238 -source /usr/local/sbin/collect_parms
239 -source /usr/local/sbin/collect_utils
240 +source /usr/sbin/collect_parms
241 +source /usr/sbin/collect_utils
244 LOGFILE="${extradir}/${SERVICE}.info"
245 diff --git a/tools/collector/scripts/collect_psqldb.sh b/tools/collector/scripts/collect_psqldb.sh
246 index d223b1b..dc45169 100755
247 --- a/tools/collector/scripts/collect_psqldb.sh
248 +++ b/tools/collector/scripts/collect_psqldb.sh
252 # Loads Up Utilities and Commands Variables
253 -source /usr/local/sbin/collect_parms
254 -source /usr/local/sbin/collect_utils
255 +source /usr/sbin/collect_parms
256 +source /usr/sbin/collect_utils
258 # postgres database commands
259 PSQL_CMD="sudo -u postgres psql --pset pager=off -q"
260 diff --git a/tools/collector/scripts/collect_sm.sh b/tools/collector/scripts/collect_sm.sh
261 index 5f0f3c9..6de18fe 100644
262 --- a/tools/collector/scripts/collect_sm.sh
263 +++ b/tools/collector/scripts/collect_sm.sh
267 # Loads Up Utilities and Commands Variables
268 -source /usr/local/sbin/collect_parms
269 -source /usr/local/sbin/collect_utils
270 +source /usr/sbin/collect_parms
271 +source /usr/sbin/collect_utils
274 LOGFILE="${extradir}/sm.info"
275 diff --git a/tools/collector/scripts/collect_sysinv.sh b/tools/collector/scripts/collect_sysinv.sh
276 index 3f27a28..6a9f4ae 100755
277 --- a/tools/collector/scripts/collect_sysinv.sh
278 +++ b/tools/collector/scripts/collect_sysinv.sh
282 # Loads Up Utilities and Commands Variables
283 -source /usr/local/sbin/collect_parms
284 -source /usr/local/sbin/collect_utils
285 +source /usr/sbin/collect_parms
286 +source /usr/sbin/collect_utils
289 LOGFILE="${extradir}/${SERVICE}.info"
290 diff --git a/tools/collector/scripts/collect_tc.sh b/tools/collector/scripts/collect_tc.sh
291 index 95cd0fe..0ee6bd8 100755
292 --- a/tools/collector/scripts/collect_tc.sh
293 +++ b/tools/collector/scripts/collect_tc.sh
297 # Loads Up Utilities and Commands Variables
298 -source /usr/local/sbin/collect_parms
299 -source /usr/local/sbin/collect_utils
300 +source /usr/sbin/collect_parms
301 +source /usr/sbin/collect_utils
304 LOGFILE="${extradir}/tc.info"
305 @@ -40,13 +40,13 @@ for i in $(ip link | grep mtu | grep eth |awk '{print $2}' | sed 's#:##g'); do
308 ###############################################################################
309 -# TC Configuration Script (/usr/local/bin/tc_setup.sh)
310 +# TC Configuration Script (/usr/bin/tc_setup.sh)
311 ###############################################################################
312 -delimiter ${LOGFILE} "cat /usr/local/bin/tc_setup.sh"
313 -if [ -f /usr/local/bin/tc_setup.sh ]; then
314 - cat /usr/local/bin/tc_setup.sh >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
315 +delimiter ${LOGFILE} "cat /usr/bin/tc_setup.sh"
316 +if [ -f /usr/bin/tc_setup.sh ]; then
317 + cat /usr/bin/tc_setup.sh >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
319 - echo "/usr/local/bin/tc_setup.sh NOT FOUND" >> ${LOGFILE}
320 + echo "/usr/bin/tc_setup.sh NOT FOUND" >> ${LOGFILE}
323 ###############################################################################
324 diff --git a/tools/collector/scripts/collect_utils b/tools/collector/scripts/collect_utils
325 index 739e161..53ad5c3 100755
326 --- a/tools/collector/scripts/collect_utils
327 +++ b/tools/collector/scripts/collect_utils
328 @@ -90,7 +90,7 @@ function source_openrc_if_needed
329 # sequences and highlight command completion
330 collect_done="collect done"
331 cmd_done_sig="expect done"
332 -cmd_done_file="/usr/local/sbin/expect_done"
333 +cmd_done_file="/usr/sbin/expect_done"
335 # Compression Commands
336 TAR_ZIP_CMD="tar -cvzf"