Changeset 1760

Show
Ignore:
Timestamp:
12/03/08 12:49:22 (1 month ago)
Author:
ton
Message:

Updated to Nagios 3.0.6

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/DEV-opsview3/CHANGES

    r1757 r1760  
    55        nagiosgraph forked and now part of opsview-core package. Creates new style RRDs if the old ones do not exist 
    66        Old style RRDs are upgraded as part of the database upgrade process. Opsview reload page will show message if migration is running 
     7        Update Nagios to 3.0.6 
    78        Updated scriptaculous to 1.8.2 
    89 

  • branches/DEV-opsview3/opsview-base

    • Property svn:ignore changed from
      agent-rpmspec
      allmibs.tar.gz
      ALTovbase*
      autossh-1.4a
      check_radius_ih-1.1
      fabtabulous
      ._fabtabulous
      hypergraph-0.6.3
      jscalendar-1.0
      nagios-3.0.4
      nagiosgraph-0.8.2
      nagios-plugins-1.4.13
      ndoutils-1.4b7
      Net-Dev-MIBLoadOrder-1.1.0
      nmis-4.2.13
      nrpe-2.12
      nrpe.cfg
      nsca-2.7.2
      opsview-base.spec
      overlib-4.21
      scriptaculous-js-1.8.2
      validation-1.5.4.1
      version
       to
      agent-rpmspec
      allmibs.tar.gz
      ALTovbase*
      autossh-1.4a
      check_radius_ih-1.1
      fabtabulous
      ._fabtabulous
      hypergraph-0.6.3
      jscalendar-1.0
      nagios-3.0.6
      nagiosgraph-0.8.2
      nagios-plugins-1.4.13
      ndoutils-1.4b7
      Net-Dev-MIBLoadOrder-1.1.0
      nmis-4.2.13
      nrpe-2.12
      nrpe.cfg
      nsca-2.7.2
      opsview-base.spec
      overlib-4.21
      scriptaculous-js-1.8.2
      validation-1.5.4.1
      version

  • branches/DEV-opsview3/opsview-base/Makefile

    r1745 r1760  
    2727RELEASE = 1 
    2828 
    29 NAGIOS = nagios-3.0.4 
     29NAGIOS = nagios-3.0.6 
    3030NAGIOSPLUG = nagios-plugins-1.4.13 
    3131CHECK_RADIUS_IH = check_radius_ih-1.1 
    …… 
    223223${NAGIOS}: 
    224224        gunzip -c ${NAGIOS}.tar.gz | tar -xf - 
     225        # There are carriage returns in the docs, which affects the patching 
     226        cd ${NAGIOS}/html/docs && perl -i -pe 's/\r\n$$/\n/' *.html 
    225227        cd ${NAGIOS} && patch -p1 < ../patches/nagios_freshness_calculations.patch 
    226228        cp patches/nagios_freshness.c ${NAGIOS}/base/freshness.c 
    …… 
    282284        # Included as part of change above 
    283285        #cd ${NAGIOS} && patch -p1 < ../patches/nagios_notification_number.patch 
    284         cd ${NAGIOS} && patch -p1 < ../patches/nagios_stop_notification_timeouts_spinning.patch 
     286        #cd ${NAGIOS} && patch -p1 < ../patches/nagios_stop_notification_timeouts_spinning.patch 
    285287        cd ${NAGIOS} && patch -p1 < ../patches/nagios_no_overwriting_input.patch 
    286288        cd ${NAGIOS} && patch -p1 < ../patches/nagios_passive_host_results_now_call_broker.patch 
    287         # These two patches are in Nagios 3.0.5. We need the next version as there are some big bugs in there 
    288         #cd ${NAGIOS} && patch -p1 < ../patches/nagios_cgi_encoded_linefeeds.patch 
    289         #cd ${NAGIOS} && patch -p1 < ../patches/nagios_block_external_change_commands.patch 
    290289        cd ${NAGIOS} && patch -p1 < ../patches/nagios_cgi_notes_icon_removed.patch 
    291290        cd ${NAGIOS} && cp ../patches/unlit-bulb.gif ./html/images/action.gif