zoeloe
22 February 2020 00:11
#1
It seems that this version breaks something.
====================================
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your local git contains modified files, this could prevent automatic updates.
[FIX]:
You can fix this with ./scripts/github-remove
Modified Files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
A ./scripts/github-remove -d essentially fixes the ./validate.php, but rerunning ./daily.sh re-introduces the same error… or is it me ?
TIA
Hi zoeloe,
to solve the issue just, remove the following files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
and then run ./daily.sh again
Language files will be regenerated automatically.
1 Like
zoeloe
22 February 2020 12:42
#3
Not sure what’s happening here, but here’s the attempt as you suggested, but IMHO there is still something wrong:
(note: there is a .gitigonore file in the dir httml/js/lang, containing:
Ignore everything in this directory
Except this file
!.gitignore
)
/opt/librenms$ ./validate.php
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your local git contains modified files, this could prevent automatic updates.
[FIX]:
You can fix this with ./scripts/github-remove
Modified Files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
[email protected] :/opt/librenms$ ./daily.sh
Updating to latest codebase OK
Updating Composer packages OK
Updating SQL-Schema OK
Updating submodules OK
Cleaning up DB OK
Fetching notifications OK
Caching PeeringDB data OK
/opt/librenms$ ./validate.php
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your local git contains modified files, this could prevent automatic updates.
[FIX]:
You can fix this with ./scripts/github-remove
Modified Files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
[email protected] :/opt/librenms$ ls -al html/js/lang/
total 380
drwxrwxr-x 2 librenms librenms 4096 Feb 22 13:32 .
drwxr-xr-x 6 librenms librenms 4096 Dec 31 00:15 …
-rw-rw-r-- 1 librenms librenms 71 Feb 22 00:45 .gitignore
-rw-rw-r-- 1 librenms librenms 76536 Feb 22 13:32 de.js
-rw-rw-r-- 1 librenms librenms 71449 Feb 22 13:32 en.js
-rw-rw-r-- 1 librenms librenms 76937 Feb 22 13:32 fr.js
-rw-rw-r-- 1 librenms librenms 28297 Feb 22 13:32 ru.js
-rw-rw-r-- 1 librenms librenms 40078 Feb 22 13:32 uk.js
-rw-rw-r-- 1 librenms librenms 74024 Feb 22 13:32 zh-TW.js
[email protected] :/opt/librenms$ ./scripts/github-remove -d
Are you sure you want to delete all modified and untracked files? [y/N] y
/opt/librenms$ ./validate.php
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
/opt/librenms$ ./daily.sh
Updating to latest codebase OK
Updating Composer packages OK
Updating SQL-Schema OK
Updating submodules OK
Cleaning up DB OK
Fetching notifications OK
Caching PeeringDB data OK
[email protected] :/opt/librenms$ ./validate.php
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your local git contains modified files, this could prevent automatic updates.
[FIX]:
You can fix this with ./scripts/github-remove
Modified Files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
the .gitignore in html/js/lang/ is correct
so delete following files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
and then run ./daily.sh again
Language files will be regenerated automatically, on update
Thats why a gitignore is in
1 Like
zoeloe
22 February 2020 14:36
#5
I’m sure your instructions would function under normal circumstances, but here goes a next attempt:
[email protected] :/opt/librenms/html/js/lang$ ls -al
total 380
drwxrwxr-x 2 librenms librenms 4096 Feb 22 13:33 .
drwxr-xr-x 6 librenms librenms 4096 Dec 31 00:15 …
-rw-rw-r-- 1 librenms librenms 71 Feb 22 00:45 .gitignore
-rw-rw-r-- 1 librenms librenms 76536 Feb 22 13:34 de.js
-rw-rw-r-- 1 librenms librenms 71449 Feb 22 13:34 en.js
-rw-rw-r-- 1 librenms librenms 76937 Feb 22 13:34 fr.js
-rw-rw-r-- 1 librenms librenms 28297 Feb 22 13:34 ru.js
-rw-rw-r-- 1 librenms librenms 40078 Feb 22 13:34 uk.js
-rw-rw-r-- 1 librenms librenms 74024 Feb 22 13:34 zh-TW.js
[email protected] :/opt/librenms/html/js/lang$ rm *.js
[email protected] :/opt/librenms/html/js/lang$ ls -al
total 12
drwxrwxr-x 2 librenms librenms 4096 Feb 22 15:27 .
drwxr-xr-x 6 librenms librenms 4096 Dec 31 00:15 …
-rw-rw-r-- 1 librenms librenms 71 Feb 22 00:45 .gitignore
FIles are deleted as per good old “rm”:
[email protected] :/opt/librenms/html/js/lang$ cd /opt/librenms/
[email protected] :/opt/librenms$ ./validate.php
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your local git contains modified files, this could prevent automatic updates.
[FIX]:
You can fix this with ./scripts/github-remove
Modified Files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
[email protected] :/opt/librenms$
OK, let’s try the ./daily.sh now:
[email protected] :/opt/librenms$ pwd
/opt/librenms
[email protected] :/opt/librenms$ ./daily.sh
Updating to latest codebase OK
Updating Composer packages OK
Updating SQL-Schema OK
Updating submodules OK
Cleaning up DB OK
Fetching notifications OK
Caching PeeringDB data OK
[email protected] :/opt/librenms$ ls -al html/js/lang/
total 380
drwxrwxr-x 2 librenms librenms 4096 Feb 22 15:30 .
drwxr-xr-x 6 librenms librenms 4096 Dec 31 00:15 …
-rw-rw-r-- 1 librenms librenms 71 Feb 22 00:45 .gitignore
-rw-rw-r-- 1 librenms librenms 76536 Feb 22 15:30 de.js
-rw-rw-r-- 1 librenms librenms 71449 Feb 22 15:30 en.js
-rw-rw-r-- 1 librenms librenms 76937 Feb 22 15:30 fr.js
-rw-rw-r-- 1 librenms librenms 28297 Feb 22 15:30 ru.js
-rw-rw-r-- 1 librenms librenms 40078 Feb 22 15:30 uk.js
-rw-rw-r-- 1 librenms librenms 74024 Feb 22 15:30 zh-TW.js
[email protected] :/opt/librenms$ ./validate.php
Component
Version
LibreNMS
1.60-56-g40cac40ae
DB Schema
2020_02_10_223323_create_alert_location_map_table (159)
PHP
7.2.24-0ubuntu0.18.04.1
MySQL
5.7.28-0ubuntu0.18.04.4
RRDTool
1.7.0
SNMP
NET-SNMP 5.7.3
====================================
[OK] Composer Version: 1.9.3
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your local git contains modified files, this could prevent automatic updates.
[FIX]:
You can fix this with ./scripts/github-remove
Modified Files:
html/js/lang/de.js
html/js/lang/en.js
html/js/lang/fr.js
html/js/lang/ru.js
html/js/lang/uk.js
html/js/lang/zh-TW.js
Still there, regenerated…
tested also a “rm” and a ./daily.sh … files are there again. So validate.php isn’t happy about it.
Doesn’t really break anything IFAIK, but still wanted to report this for code cleanup puroposes.
TIA
The problem with the listed files in comming with validate.php will be solved as soon as possible.
As long as daily.sh runs without problems, updating issue is solved first
zoeloe
22 February 2020 22:28
#7
Great, knowing that there was a trivial non-breaking bug !
Thanks for the explanation and followup. My 2 cents.
zoeloe
24 February 2020 20:04
#8
8a2ce01dc still contains the anomaly.
zoeloe
26 February 2020 10:50
#9
26 Feb:
trying a manual ./daily.sh, and this says that the locally modded files: html/js/lang/.js would be overwritten by the merge.
So a rm html/js/lang/ *.js
and a succesfull ./daily.sh make ./validate.php happy (version g6d22a885a).
Issue closed I guess. Thanks for the assistance.