Cacti Upgrade

Cacti Network Monitoring

Cacti: 1.2.27 to 1.2.30
Weathermap: 1.3 to 1.3.1

cd /var/www/html/cacti
cat include/cacti_version
git status
git config --global --add safe.directory /var/www/html/cacti

On branch 1.2.x
Your branch is up to date with 'origin/1.2.x'.

Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: scripts/cacti_user_stats.php
modified: scripts/ss_count_oids.php
modified: scripts/ss_cpoller.php
modified: scripts/ss_fping.php
modified: scripts/ss_gexport.php
modified: scripts/ss_host_cpu.php
modified: scripts/ss_host_disk.php
modified: scripts/ss_hstats.php
modified: scripts/ss_net_snmp_disk_bytes.php
modified: scripts/ss_net_snmp_disk_io.php
modified: scripts/ss_poller.php
modified: scripts/ss_webseer.php
modified: service/cactid.service

Untracked files:
(use "git add ..." to include in what will be committed)
resource/script_queries/aruba_controller_cpu.xml
resource/script_queries/aruba_instant_wlan_client.xml
resource/script_queries/query-akcp-airflow.xml
resource/script_queries/query-akcp-fourtwenty.xml
resource/script_queries/query-akcp-humidity.xml
resource/script_queries/query-akcp-temperature.xml
resource/script_queries/query-baytech-circuits.xml
resource/script_server/aruba_oscx_6x00_fan.xml
resource/script_server/aruba_oscx_6x00_power.xml
resource/script_server/aruba_oscx_6x00_temperature.xml
resource/script_server/aruba_oscx_6x00_vsf.xml
resource/script_server/mikrotik_interfaces.xml
resource/script_server/mikrotik_queues.xml
resource/script_server/mikrotik_qusers.xml
resource/script_server/mikrotik_trees.xml
resource/script_server/mikrotik_wireless_reg.xml
resource/script_server/netsnmp_lmsensors_fan.xml
resource/script_server/netsnmp_lmsensors_thermal.xml
resource/script_server/netsnmp_lmsensors_voltage.xml
resource/snmp_queries/acme_RealmSessions.xml
resource/snmp_queries/acme_Temperature.xml
resource/snmp_queries/acme_sessionDirector.xml
resource/snmp_queries/acme_voltage_2.xml
resource/snmp_queries/apc_pdu_breakers.xml
resource/snmp_queries/apc_pdu_phases.xml
resource/snmp_queries/aruba_controller_wslx_apinfo.xml
resource/snmp_queries/aruba_instant_ap_radio.xml
resource/snmp_queries/aruba_instant_ap_stats.xml
resource/snmp_queries/baytech-rpc.xml
resource/snmp_queries/cisco_bgp.xml
resource/snmp_queries/cisco_hsrp.xml
resource/snmp_queries/clearpass_services.xml
resource/snmp_queries/clearpass_sources.xml
resource/snmp_queries/esxi_cpu.xml
resource/snmp_queries/esxi_hw.xml
resource/snmp_queries/hpe_ilo_cpu.xml
resource/snmp_queries/hpe_ilo_darray.xml
resource/snmp_queries/hpe_ilo_fans.xml
resource/snmp_queries/hpe_ilo_hdd.xml
resource/snmp_queries/hpe_ilo_mem.xml
resource/snmp_queries/hpe_ilo_nic.xml
resource/snmp_queries/hpe_ilo_temp.xml
resource/snmp_queries/inrow_group.xml
resource/snmp_queries/inrow_unit.xml
resource/snmp_queries/netscaler_nsCPUTable.xml
resource/snmp_queries/netscaler_nsIfStatsTable.xml
resource/snmp_queries/netscaler_nsRnatPerIPStatsTable.xml
resource/snmp_queries/netscaler_nsSysHealthDiskTable.xml
resource/snmp_queries/netscaler_serviceGroupMemberTable.xml
resource/snmp_queries/netscaler_serviceTable.xml
resource/snmp_queries/netscaler_vserverTable.xml
resource/snmp_queries/printer_supply.xml
resource/snmp_queries/snmp_ups_input.xml
resource/snmp_queries/snmp_ups_output.xml
resource/snmp_queries/synology_snmp_disk_perf.xml
resource/snmp_queries/synology_snmp_disk_status.xml
resource/snmp_queries/synology_snmp_raid_status.xml
resource/snmp_queries/synology_snmp_services.xml
resource/snmp_queries/synology_snmp_smart_status.xml

no changes added to commit (use "git add" and/or "git commit -a")

git stash

git status

git pull origin 1.2.x

cd /var/www/html/cacti/plugins/weathermap
git status
git config --global --add safe.directory
git stash
git pull origin develop
git stash pop