Merge pull request 'include fixed' (#72) from development_manual2 into development

Reviewed-on: #72
This commit is contained in:
mik-tf 2024-05-14 18:05:03 +00:00
commit db7fde432c
15 changed files with 27 additions and 28 deletions

View File

@ -12,7 +12,7 @@
- [Virtual Machines](dashboard/solutions/vm_intro.md) - [Virtual Machines](dashboard/solutions/vm_intro.md)
- [Micro and Full VM Differences ](dashboard/solutions/vm_differences.md) - [Micro and Full VM Differences ](dashboard/solutions/vm_differences.md)
- [Full Virtual Machine](dashboard/solutions/fullVm.md) - [Full Virtual Machine](dashboard/solutions/fullVm.md)
- [Micro Virtual Machine](dashboard/solutions/vm.md) - [Micro Virtual Machine](dashboard/solutions/microvm.md)
- [Nixos MicroVM](dashboard/solutions/nixos_micro.md) - [Nixos MicroVM](dashboard/solutions/nixos_micro.md)
- [Add a Domain](dashboard/solutions/add_domain.md) - [Add a Domain](dashboard/solutions/add_domain.md)
- [Orchestrators](dashboard/deploy/orchestrators.md) - [Orchestrators](dashboard/deploy/orchestrators.md)
@ -304,7 +304,6 @@
- [TFGrid v3.0.0 Alpha-2](about/roadmap/releasenotes/tfgrid_release_3_0_a2.md) - [TFGrid v3.0.0 Alpha-2](about/roadmap/releasenotes/tfgrid_release_3_0_a2.md)
- [TFGrid v3.0.0](about/roadmap/releasenotes/tfgrid_release_3_0.md) - [TFGrid v3.0.0](about/roadmap/releasenotes/tfgrid_release_3_0.md)
- [ThreeFold Token](about/token_overview/token_overview.md) - [ThreeFold Token](about/token_overview/token_overview.md)
- [Special Wallets](about/token_overview/special_wallets/stats_special_wallets.md)
- [Technology](tech/technology_toc.md) - [Technology](tech/technology_toc.md)
- [Introduction](tech/technology.md) - [Introduction](tech/technology.md)
- [The Internet Today](tech/internet_today.md) - [The Internet Today](tech/internet_today.md)

View File

@ -69,8 +69,8 @@ The TFT market price and marketcap are as follows:
| **Description** | **Value** | | **Description** | **Value** |
| ------------------------- | ------------- | | ------------------------- | ------------- |
| TFT Market Price | !!wiki.include page:'manual:tft_value.md' USD | | TFT Market Price | 0.028 USD |
| TFT Market Cap | !!wiki.include page:'manual:tft_marketcap.md' USD | | TFT Market Cap | 21,840,000 USD |
The market cap is equal to the product of the TFT market price and the circulating supply. The market cap is equal to the product of the TFT market price and the circulating supply.
@ -82,7 +82,6 @@ The values here are subject to change. Check the current market conditions.
- [ThreeFold History](threefold_history.md) - [ThreeFold History](threefold_history.md)
- [Token History](token_history.md) - [Token History](token_history.md)
- [Special Wallets](stats_special_wallets.md)
## Disclaimer ## Disclaimer

View File

@ -16,36 +16,36 @@
- The current prices are for resources usage on mainnet (testnet get 50% discount) - The current prices are for resources usage on mainnet (testnet get 50% discount)
- A month is considered as 30 days (720 hours) - A month is considered as 30 days (720 hours)
- We are considering a TFT market price of 0.028
| Cloud Units | Description | mUSD | mTFT | | Cloud Units | Description | mUSD | mTFT |
| ----------------- | ------------------------------------------------ | ------------------ | ------------------ | | ----------------- | ------------------------------------------------ | ------------------ | ------------------ |
| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | !!wiki.include page:'manual:su_musd_hour.md' | !!wiki.include page:'manual:cu_mtft_hour.md' | | Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 30.56\/hour | 1091.43\/hour |
| Storage Unit (SU) | typically 1 TB of netto usable storage (*) | !!wiki.include page:'manual:cu_musd_hour.md' | !!wiki.include page:'manual:su_mtft_hour.md' | | Storage Unit (SU) | typically 1 TB of netto usable storage (*) | 19.44\/hour | 694.29\/hour |
| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | !!wiki.include page:'manual:nu_musd_hour.md' | !!wiki.include page:'manual:nu_mtft_hour.md' | | Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 50.00\/hour | 1785.71\/hour |
<br> <br>
| Network Addressing | Description | mUSD | mTFT | | Network Addressing | Description | mUSD | mTFT |
| ------------------ | ------------------------------------------ | --------------------- | --------------------- | | ------------------ | ------------------------------------------ | --------------------- | --------------------- |
| IPv4 Address | Public Ip Address as used by a TFGrid user | !!wiki.include page:'manual:ip_musd_hour.md' | !!wiki.include page:'manual:ip_mtft_hour.md' | | IPv4 Address | Public Ip Address as used by a TFGrid user | 6.94\/hour | 247.86\/hour |
| Unique Name | Usable as name on webgateways | !!wiki.include page:'manual:name_musd_hour.md' | !!wiki.include page:'manual:name_mtft_hour.md' | | Unique Name | Usable as name on webgateways | 1.39\/hour | 49.64\/hour |
| Unique Domain Name | Usable as dns name on webgateways | !!wiki.include page:'manual:dname_musd_hour.md' | !!wiki.include page:'manual:dname_mtft_hour.md' | | Unique Domain Name | Usable as dns name on webgateways | 2.78\/hour | 99.29\/hour |
- mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT - mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT
- TFT pricing pegged to USD (pricing changes in line with TFT/USD rate) - TFT pricing pegged to USD (pricing changes in line with TFT/USD rate)
- The current TFT to USD price is !!wiki.include page:'manual:tft_value.md' USD
- pricing is calculated per hour for the TFGrid 3.0 - pricing is calculated per hour for the TFGrid 3.0
> Please check our [Cloud Pricing for utilization sheet](https://docs.google.com/spreadsheets/d/1E6MpGs15h1_flyT5AtyKp1TixH1ILuGo5tzHdmjeYdQ/edit#gid=2014089775) for more details. > Please check our [Cloud Pricing for utilization sheet](https://docs.google.com/spreadsheets/d/1E6MpGs15h1_flyT5AtyKp1TixH1ILuGo5tzHdmjeYdQ/edit#gid=2014089775) for more details.
## Pricing Expressed Per Month ## Pricing Expressed Per Month
| Cloud Units | description | USD NO DISCOUNT | USD 60% DISCOUNT | | Cloud Units | Description | USD - No Discount | USD - 60% Discount |
| ----------------- | ------------------------------------------------ | ------------------- | ---------------------------- | | ----------------- | ------------------------------------------------ | ------------------- | ---------------------------- |
| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 22.00/month | 8.80/month | | Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage | 22.00\/month | 8.80\/month |
| Storage Unit (SU) | typically 1 TB of netto usable storage | 14.00/month | 5.60/month | | Storage Unit (SU) | typically 1 TB of netto usable storage | 14.00\/month | 5.60\/month |
| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 0.05/GB | 0.03/GB | | Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | 0.05\/GB | 0.03\/GB |
| IPv4 Address | Public Ip Address as used by a TFGrid user | 5.00/month | 3.00/month | | IPv4 Address | Public Ip Address as used by a TFGrid user | 5.00\/month | 3.00\/month |
## Operation Fees ## Operation Fees

View File

@ -5,7 +5,7 @@ On the TFGrid, you can deploy both micro and full virtual machines.
<h2> Table of Contents </h2> <h2> Table of Contents </h2>
- [Micro and Full VM Differences ](vm_differences.md) - [Micro and Full VM Differences ](vm_differences.md)
- [Full Virtual Machine](fullVm.md) - [Full Virtual Machine](fullvm.md)
- [Micro Virtual Machine](vm.md) - [Micro Virtual Machine](microvm.md)
- [Nixos MicroVM](nixos_micro.md) - [Nixos MicroVM](nixos_micro.md)
- [Add a Domain](add_domain.md) - [Add a Domain](add_domain.md)

View File

@ -0,0 +1 @@
0.000

View File

@ -1 +1 @@
1608.42 1528.00

View File

@ -1 +1 @@
146.32 139.00

View File

@ -1 +1 @@
365.26 347.00

View File

@ -1 +1 @@
73.16 69.50

View File

@ -1 +1 @@
2631.58 2500.00

View File

@ -1 +1 @@
1023.16 972.00

View File

@ -1 +1 @@
14,820,000 0

View File

@ -1 +1 @@
0.019 0.000