Dashboard and 1.2.1
-
lol, put the file in /usr/local and ran patch <dashboardpatch.txt<br>This time when I ran the patch –reverse <dashboardpatch.txt it="" doubled="" the="" amount="" of="" code="" on="" screen="" when="" i="" go="" to="" view="" dashboard<br="">I'm running 1.2.2 and when I ran the reverse I got
# patch --reverse <dashboardpatch.txt<br>Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -rub www-orig/diag_logs_filter_dynamic.php www/diag_logs_filter_dynamic.php |--- www-orig/diag_logs_filter_dynamic.php 2007-07-04 16:14:26.000000000 -0400 |+++ www/diag_logs_filter_dynamic.php 2009-02-14 10:23:00.000000000 -0500 -------------------------- Patching file www/diag_logs_filter_dynamic.php using Plan A... Hunk #1 succeeded at 76. Hunk #2 succeeded at 444. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -rub www-orig/widgets/include/ipsec.inc www/widgets/include/ipsec.inc |--- www-orig/widgets/include/ipsec.inc 2007-10-05 04:40:00.000000000 -0400 |+++ www/widgets/include/ipsec.inc 2009-02-08 21:03:25.000000000 -0500 -------------------------- Patching file www/widgets/include/ipsec.inc using Plan A... Hunk #1 failed at 4. 1 out of 1 hunks failed--saving rejects to www/widgets/include/ipsec.inc.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -rub www-orig/widgets/include/log.inc www/widgets/include/log.inc |--- www-orig/widgets/include/log.inc 2007-07-15 13:24:00.000000000 -0400 |+++ www/widgets/include/log.inc 2009-02-14 09:41:12.000000000 -0500 -------------------------- Patching file www/widgets/include/log.inc using Plan A... Hunk #1 failed at 14. Hunk #2 failed at 42. Hunk #3 failed at 159. 3 out of 3 hunks failed--saving rejects to www/widgets/include/log.inc.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -rub www-orig/widgets/widgets/log.widget.php www/widgets/widgets/log.widget.php |--- www-orig/widgets/widgets/log.widget.php 2007-07-02 22:56:42.000000000 -0400 |+++ www/widgets/widgets/log.widget.php 2009-02-13 20:37:48.000000000 -0500 -------------------------- Patching file www/widgets/widgets/log.widget.php using Plan A... Hunk #1 failed at 66. 1 out of 1 hunks failed--saving rejects to www/widgets/widgets/log.widget.php.rej done</dashboardpatch.txt<br> ```</dashboardpatch.txt></dashboardpatch.txt<br> -
Ah… so it didn't apply cleanly. I wonder if they put out a new version of the dashboard package since I made the patch.
What version of the dashboard package does it say you have installed?
I tested and applied the patch against a 1.2.2 system before I posted the patch here...
This might help clean stuff up:
find /usr/local -name "*.rej" -delete -
0.6.2
I ran that command and received
Fatal error: Cannot redeclare get_ipsec_tunnel_sad() (previously declared in /usr/local/www/widgets/include/ipsec.inc:7) in /usr/local/www/widgets/include/ipsec.inc.orig on line 5And now I have completely lost my dashboard. Can't reinstall the package or the gui to fix it. It'll reinstall, but I get the same error.
-
It still has the ".orig" files sitting there, which need to be deleted (see my earlier post)
find /usr/local -name "*.orig" -deleteI'm working on a better way to test this out…
-
I found the problem…. ID10T error!!! I didn't remove the package then run find /usr/local -name "*.orig" -delete then install the package again. Thanks bud. Please let us know when you find a fix for that, maybe it's fix in 1.2.3 or 2.0
Edit: LOL, I just noticed that my firewall logs box is working after all this :-P Nice, Thanks!!
Solved?
-
Strange, so I just logged into another remote PfSense box with the same issue. I applied the patch and got the same code on the page and "find /usr/local -name ".orig" -delete"
didn't solve the problem of the code on the page but "find /usr/local -name ".rej" -delete" did and fixed the problem of the logs not working. It appears your dashboardpatch worked, the boxes just needed some cleanup without uninstalling and reinstalling the dashboard. I hope this helps you correct what ever it is in the script. -
It's probably a couple files that don't match up quite right with the most current dashboard package.
I'll have to adjust the patch tomorrow when I'm at work with handy access to a fresh test box.
-
Actually it looks like the patch is fine, but the formatting is off in the text file somehow when I upload it.
I'll have to investigate that more later/tomorrow.
Edit: updated earlier post with a better patch and removed the attachment from this one.
-
LOL, well it's all good now, no reason to patch the patched dashboard ;)
But if you'd like me to help you with something then let me know.
-
I suspect it has something to do with unix/dos line termination. That, or it's losing the proper tabs/spacing when I upload it.
I need to do some more testing, but I've also added additional functionality to the patch.
If you have another install to test on, give each of these a try with "patch -C < patchfile.txt" that way it will not modify anything - just test the patch run.
(attachments removed since the updates are now in a new dashboard package)
-
Weird. Neither one of those worked on my test box.
This works, though:
(removed since the updates are now in a new dashboard package) -
Huh? Did you remove your patch document? I don't see it posted anymore. I was going to run it to see what happens ;)
-
Yeah I removed the attachments as they were broken in some way. I don't know if it was the line termination, spacing, what, but they were mangled when I downloaded them.
You can fetch it straight from my web server and it works that way:
(removed since the updates are now in a new dashboard package) -
Just a little update: I've gotten clearance to fix the dashboard, but my current patches need a little more work/testing before I tar up a new version of the package.
If anyone has seen anything else that doesn't work quite right, let me know.
-
Well, I dunno if it's a firefox issue or a dashboard issue but I know if i leave the dashboard open on my web browser for an extended period of time, say 4 hours plus then firefox starts using up CPU resources like crazy!!! That is until I refresh the page, move to another page or close the page.
If you want to take that on that would be cool but unnecessary I suppose :-P
-
I've had that happen to me as well.
I'm not sure if that is happening due to the AJAX log view or the traffic graphs, but I think it might be the traffic graphs as it has happened to be since before I fixed the AJAX part of the log widget.
I haven't tried this yet, but another test to see if it is the AJAX viewer would be to look at the 'dynamic' view of the filter logs. That uses much of the same code as the widget. If that also locks up after several hours, it's probably still in that code.
I know that code had other issues before, but I think I got most of them. I know there are more, but I didn't think they caused long-term problems, just problems with large/fast updates.
-
I left the main dashboard screen running overnight on my laptop and it was still working and responsive this morning. A little slower than it was right after a refresh, but not locked up like it had done previously.
I'm not sure if it's changes that are up in the current package, or updates I have done since, that have improved it.
I'm hoping to have yet another version of the dashboard out with a couple new widgets by the end of the weekend.
