From 86d5be0fb320c4ac151b2aa96c81726718a3b6a5 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Wed, 6 Nov 2024 20:25:45 -0500 Subject: [PATCH] bump to v0.12.0 --- CHANGELOG.md | 6 ++++++ README.md | 2 +- collector/printer_object.go | 4 ++++ version.txt | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52d1b85..12132e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Change Log ========== +v0.12.0 +------- + +- Add support for multiple mcu's. Thanks to @Wulfsta #40. +- Improved error logging for indexed results to address issues #34 and #35 + v0.11.2 ------- diff --git a/README.md b/README.md index 8481125..2509acc 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ group of metrics is queried from a different Moonraker API endpoint. | `job_queue` | x | `klipper_job_queue_length` | | `system_info` | x | `klipper_system_cpu_count` | | `directory_info` | | `klipper_disk_usage_available`
`klipper_disk_usage_total`
`klipper_disk_usage_used` | -| `printer_objects` | | `klipper_controller_fan_rpm{fan="`*fan*`"}`
`klipper_controller_fan_speed={fan="`*fan*`"}`
`klipper_extruder_power`
`klipper_extruder_pressure_advance`
`klipper_extruder_smooth_time`
`klipper_extruder_target`
`klipper_extruder_temperature`
`klipper_fan_rpm`
`klipper_fan_speed`
`klipper_filament_sensor_detected{sensor="`*sensor*`"}`
`klipper_filament_sensor_enabled{sensor="`*sensor*`"}`
`klipper_gcode_extrude_factor`
`klipper_gcode_position_e`
`klipper_gcode_position_x`
`klipper_gcode_position_y`
`klipper_gcode_position_z`
`klipper_gcode_speed_factor`
`klipper_gcode_speed`
`klipper_generic_fan_rpm{fan="`*fan*`"}`
`klipper_generic_fan_speed{fan="`*fan*`"}`
`klipper_heater_bed_power`
`klipper_heater_bed_target`
`klipper_heater_bed_temperature`
`klipper_mcu_awake`
`klipper_mcu_task_avg`
`klipper_mcu_task_stddev`
`klipper_mcu_clock_frequency`
`klipper_mcu_invalid_bytes`
`klipper_mcu_read_bytes`
`klipper_mcu_ready_bytes`
`klipper_mcu_receive_seq`
`klipper_mcu_retransmit_bytes`
`klipper_mcu_retransmit_seq`
`klipper_mcu_rto`
`klipper_mcu_rttvar`
`klipper_mcu_send_seq`
`klipper_mcu_stalled_bytes`
`klipper_mcu_srtt`
`klipper_mcu_write_bytes`
`klipper_output_pin_value{pin="`*pin*`"}`
`klipper_printing_time`
`klipper_print_filament_used`
`klipper_print_file_position`
`klipper_print_file_progress`
`klipper_print_gcode_progress`
`klipper_print_total_duration`
`klipper_temperature_fan_speed{fan="`*fan*`"}`
`klipper_temperature_fan_temperature{fan="`*fan*`"}`
`klipper_temperature_fan_target{fan="`*fan*`"}`
`klipper_temperature_sensor_temperature{sensor="`*sensor*`"}`
`klipper_temperature_sensor_measured_max_temp{sensor="`*sensor*`"}`
`klipper_temperature_sensor_measured_min_temp{sensor="`*sensor*`"}`
`klipper_toolhead_estimated_print_time`
`klipper_toolhead_max_accel_to_decel`
`klipper_toolhead_max_accel`
`klipper_toolhead_max_velocity`
`klipper_toolhead_print_time`
`klipper_toolhead_square_corner_velocity` | +| `printer_objects` | | `klipper_controller_fan_rpm{fan="`*fan*`"}`
`klipper_controller_fan_speed={fan="`*fan*`"}`
`klipper_extruder_power`
`klipper_extruder_pressure_advance`
`klipper_extruder_smooth_time`
`klipper_extruder_target`
`klipper_extruder_temperature`
`klipper_fan_rpm`
`klipper_fan_speed`
`klipper_filament_sensor_detected{sensor="`*sensor*`"}`
`klipper_filament_sensor_enabled{sensor="`*sensor*`"}`
`klipper_gcode_extrude_factor`
`klipper_gcode_position_e`
`klipper_gcode_position_x`
`klipper_gcode_position_y`
`klipper_gcode_position_z`
`klipper_gcode_speed_factor`
`klipper_gcode_speed`
`klipper_generic_fan_rpm{fan="`*fan*`"}`
`klipper_generic_fan_speed{fan="`*fan*`"}`
`klipper_heater_bed_power`
`klipper_heater_bed_target`
`klipper_heater_bed_temperature`
`klipper_mcu_awake{mcu="`*mcu*`"}`
`klipper_mcu_task_avg{mcu="`*mcu*`"}`
`klipper_mcu_task_stddev{mcu="`*mcu*`"}`
`klipper_mcu_clock_frequency{mcu="`*mcu*`"}`
`klipper_mcu_invalid_bytes{mcu="`*mcu*`"}`
`klipper_mcu_read_bytes{mcu="`*mcu*`"}`
`klipper_mcu_ready_bytes{mcu="`*mcu*`"}`
`klipper_mcu_receive_seq{mcu="`*mcu*`"}`
`klipper_mcu_retransmit_bytes{mcu="`*mcu*`"}`
`klipper_mcu_retransmit_seq{mcu="`*mcu*`"}`
`klipper_mcu_rto`
`klipper_mcu_rttvar{mcu="`*mcu*`"}`
`klipper_mcu_send_seq{mcu="`*mcu*`"}`
`klipper_mcu_stalled_bytes{mcu="`*mcu*`"}`
`klipper_mcu_srtt{mcu="`*mcu*`"}`
`klipper_mcu_write_bytes{mcu="`*mcu*`"}`
`klipper_output_pin_value{pin="`*pin*`"}`
`klipper_printing_time`
`klipper_print_filament_used`
`klipper_print_file_position`
`klipper_print_file_progress`
`klipper_print_gcode_progress`
`klipper_print_total_duration`
`klipper_temperature_fan_speed{fan="`*fan*`"}`
`klipper_temperature_fan_temperature{fan="`*fan*`"}`
`klipper_temperature_fan_target{fan="`*fan*`"}`
`klipper_temperature_sensor_temperature{sensor="`*sensor*`"}`
`klipper_temperature_sensor_measured_max_temp{sensor="`*sensor*`"}`
`klipper_temperature_sensor_measured_min_temp{sensor="`*sensor*`"}`
`klipper_toolhead_estimated_print_time`
`klipper_toolhead_max_accel_to_decel`
`klipper_toolhead_max_accel`
`klipper_toolhead_max_velocity`
`klipper_toolhead_print_time`
`klipper_toolhead_square_corner_velocity` | | `history` | | `klipper_current_print_first_layer_height`
`klipper_current_print_layer_height`
`klipper_current_print_object_height`
`klipper_current_print_total_duration`
`klipper_longest_job`
`klipper_longest_print`
`klipper_total_filament_used`
`klipper_total_jobs`
`klipper_total_print_time`
`klipper_total_time` | Authentication diff --git a/collector/printer_object.go b/collector/printer_object.go index 97c2b8e..0ad4605 100644 --- a/collector/printer_object.go +++ b/collector/printer_object.go @@ -432,6 +432,10 @@ func (c Collector) fetchMoonrakerPrinterObjects(klipperHost string, apiKey strin log.Tracef("%+v", string(data)) + if res.StatusCode != http.StatusOK { + return nil, fmt.Errorf("unexpected status code: %d %s", res.StatusCode, res.Status) + } + var response PrinterObjectResponse err = json.Unmarshal(data, &response) diff --git a/version.txt b/version.txt index 1554d9b..3061e9e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.11.2 \ No newline at end of file +v0.12.0 \ No newline at end of file