Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Bring patch commits to main (#7647)

Browse source
This commit is contained in:
gillespi314 2022-09-08 12:20:07 -05:00 committed by GitHub
parent 431a3479e6
commit abc131575b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
View file

@ -35,7 +35,10 @@ import {
import { IHost } from "interfaces/host";
import { ILabel } from "interfaces/label";
import { IMDMSolution, IMunkiIssuesAggregate } from "interfaces/macadmins";
import { IOperatingSystemVersion } from "interfaces/operating_system";
import {
formatOperatingSystemDisplayName,
IOperatingSystemVersion,
} from "interfaces/operating_system";
import { IPolicy } from "interfaces/policy";
import { ISoftware } from "interfaces/software";
import { ITeam } from "interfaces/team";
@ -1224,14 +1227,15 @@ const ManageHostsPage = ({
if (!os) return null;
const { name, name_only, version } = os;
const label =
const label = formatOperatingSystemDisplayName(
name_only || version
? `${name_only || ""} ${version || ""}`
: `${name || ""}`;
: `${name || ""}`
);
const TooltipDescription = (
<span className={`tooltip__tooltip-text`}>
{`Hosts with ${name_only || name}`},<br />
{`Hosts with ${formatOperatingSystemDisplayName(name_only || name)}`},
<br />
{version && `${version} installed`}
</span>
);

2
server/datastore/mysql/hosts.go
View file

@ -2435,7 +2435,7 @@ func (ds *Datastore) UpdateOSVersions(ctx context.Context) error {
// nothing to do so return early
if len(statsByTeamID) < 1 {
// log to help troubleshooting in case this happens
level.Info(ds.logger).Log("msg", "Cannot update aggregated stats for os versions: Check for records in operating_systems and host_perating_systems.")
level.Debug(ds.logger).Log("msg", "Cannot update aggregated stats for os versions: Check for records in operating_systems and host_perating_systems.")
return nil
}